From 7073ad2ac2a8b181715af78e92a0005a6204397e Mon Sep 17 00:00:00 2001 From: Michel Fedde <35878897+Neintonine@users.noreply.github.com> Date: Fri, 2 Feb 2024 20:51:48 +0100 Subject: [PATCH] fixes imports --- build/.version | 2 +- src/__init__.py | 26 ++++++++++----------- src/menu/id_mask_editor_options.py | 2 +- src/menu/id_mask_select_menu.py | 2 +- src/operators/bake_to_id_map.py | 2 +- src/operators/create_id_mask.py | 1 - src/operators/id_editor_create_id.py | 3 +-- src/operators/id_editor_remove_id.py | 4 ---- src/operators/id_mask_select.py | 1 - src/panels/bake_panel_info.py | 2 +- src/panels/bake_panel_options.py | 2 +- src/panels/id_mask_editor.py | 18 +++++++------- src/panels/id_mask_editor_id_list.py | 6 ++--- src/properties/bake_properties.py | 6 ++--- src/properties/id_mask_editor_properties.py | 4 ++-- 15 files changed, 36 insertions(+), 45 deletions(-) diff --git a/build/.version b/build/.version index 0a4c37c..fa31bb9 100644 --- a/build/.version +++ b/build/.version @@ -1 +1 @@ -1.3.0+build.1 \ No newline at end of file +1.3.1+build.2 \ No newline at end of file diff --git a/src/__init__.py b/src/__init__.py index d5cbd19..f753ac2 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -1,17 +1,17 @@ import bpy -from src.menu import id_mask_select_menu -from src.menu.id_mask_editor_options import IDEDITOR_IDMaskEditorOptionsMenu -from src.operators.create_id_mask import CreateIDMaskOperator -from src.operators.id_editor_apply_color import IDEDITOR_ColorApplyOperator -from src.operators.id_editor_create_id import IDEDITOR_CreateIDOperator -from src.operators.id_editor_find_used_ids import IDEDITOR_FindUsedIDsOperator -from src.operators.id_editor_paint import IDEDITOR_PaintIDMaskOperator -from src.operators.id_editor_remove_id import IDEDITOR_RemoveIDOperator -from src.operators.id_editor_revert_color import IDEDITOR_ColorResetOperator -from src.operators.id_mask_select import IDEDITOR_SelectIDMaskOperator -from src.panels.id_mask_editor_id_list import IDMaskEditorIDList -from src.properties.id_mask_editor_value_properties import IDMaskEditorValueProperties +from . menu import id_mask_select_menu +from . menu.id_mask_editor_options import IDEDITOR_IDMaskEditorOptionsMenu +from . operators.create_id_mask import CreateIDMaskOperator +from . operators.id_editor_apply_color import IDEDITOR_ColorApplyOperator +from . operators.id_editor_create_id import IDEDITOR_CreateIDOperator +from . operators.id_editor_find_used_ids import IDEDITOR_FindUsedIDsOperator +from . operators.id_editor_paint import IDEDITOR_PaintIDMaskOperator +from . operators.id_editor_remove_id import IDEDITOR_RemoveIDOperator +from . operators.id_editor_revert_color import IDEDITOR_ColorResetOperator +from . operators.id_mask_select import IDEDITOR_SelectIDMaskOperator +from . panels.id_mask_editor_id_list import IDMaskEditorIDList +from . properties.id_mask_editor_value_properties import IDMaskEditorValueProperties from . panels.bake_panel_options import BakeToIDOptionsPanel from . operators.bake_to_id_map import BakeToIDMapOperator from . panels.bake_panel import BakeToIDMapPanel @@ -19,7 +19,7 @@ from . panels.bake_panel_info import BakeToIDInfoPanel from . panels.id_mask_editor import IDMaskEditorPanel from . properties.bake_properties import BakeToIDProperties -from src.properties.id_mask_editor_properties import IDMaskEditorProperties +from . properties.id_mask_editor_properties import IDMaskEditorProperties bl_info = { "name": "ID Mask - Tools", diff --git a/src/menu/id_mask_editor_options.py b/src/menu/id_mask_editor_options.py index f1e092f..7590705 100644 --- a/src/menu/id_mask_editor_options.py +++ b/src/menu/id_mask_editor_options.py @@ -1,6 +1,6 @@ import bpy -from src.operators.id_editor_find_used_ids import IDEDITOR_FindUsedIDsOperator +from .. operators.id_editor_find_used_ids import IDEDITOR_FindUsedIDsOperator class IDEDITOR_IDMaskEditorOptionsMenu(bpy.types.Menu): diff --git a/src/menu/id_mask_select_menu.py b/src/menu/id_mask_select_menu.py index 48212bb..b95cb74 100644 --- a/src/menu/id_mask_select_menu.py +++ b/src/menu/id_mask_select_menu.py @@ -1,6 +1,6 @@ import bpy -from src.operators.id_mask_select import IDEDITOR_SelectIDMaskOperator +from .. operators.id_mask_select import IDEDITOR_SelectIDMaskOperator def id_mask_select_menu_function(self, context): self.layout.operator(IDEDITOR_SelectIDMaskOperator.bl_idname).isCalledFromEditor = False diff --git a/src/operators/bake_to_id_map.py b/src/operators/bake_to_id_map.py index 6f58564..f1ecc50 100644 --- a/src/operators/bake_to_id_map.py +++ b/src/operators/bake_to_id_map.py @@ -1,6 +1,6 @@ import bpy -from ..types.colors import get_color +from .. types.colors import get_color from .. types.sources import get_source from .. types.targets import get_target diff --git a/src/operators/create_id_mask.py b/src/operators/create_id_mask.py index 6c0e3a5..a5d6b2c 100644 --- a/src/operators/create_id_mask.py +++ b/src/operators/create_id_mask.py @@ -1,6 +1,5 @@ import bpy - class CreateIDMaskOperator(bpy.types.Operator): bl_idname = "id_mask_editor.create_id_mask_attribute" bl_label = "Create ID Mask - Attribute" diff --git a/src/operators/id_editor_create_id.py b/src/operators/id_editor_create_id.py index 1e26fc3..83cfe19 100644 --- a/src/operators/id_editor_create_id.py +++ b/src/operators/id_editor_create_id.py @@ -1,7 +1,6 @@ import bpy -from src.properties.id_mask_editor_value_properties import IDMaskEditorValueProperties -from src.types.colors import get_color +from .. types.colors import get_color class IDEDITOR_CreateIDOperator(bpy.types.Operator): diff --git a/src/operators/id_editor_remove_id.py b/src/operators/id_editor_remove_id.py index 0455986..51e3a77 100644 --- a/src/operators/id_editor_remove_id.py +++ b/src/operators/id_editor_remove_id.py @@ -1,9 +1,5 @@ import bpy -from src.properties.id_mask_editor_value_properties import IDMaskEditorValueProperties -from src.types.colors import get_color - - class IDEDITOR_RemoveIDOperator(bpy.types.Operator): bl_idname = "id_mask_editor.remove_id_mask" bl_label = "id_mask_editor.remove_id_mask" diff --git a/src/operators/id_mask_select.py b/src/operators/id_mask_select.py index 811c872..927869d 100644 --- a/src/operators/id_mask_select.py +++ b/src/operators/id_mask_select.py @@ -1,6 +1,5 @@ import bpy - class IDEDITOR_SelectIDMaskOperator(bpy.types.Operator): bl_idname = "id_mask_editor.select_id_mask" bl_label = "Select by ID Mask" diff --git a/src/panels/bake_panel_info.py b/src/panels/bake_panel_info.py index ed79817..ae054d5 100644 --- a/src/panels/bake_panel_info.py +++ b/src/panels/bake_panel_info.py @@ -1,6 +1,6 @@ import bpy -from ..types.colors import get_color +from .. types.colors import get_color from .. types.sources import get_source diff --git a/src/panels/bake_panel_options.py b/src/panels/bake_panel_options.py index f219d08..543ab6e 100644 --- a/src/panels/bake_panel_options.py +++ b/src/panels/bake_panel_options.py @@ -2,7 +2,7 @@ import textwrap import bpy -from ..types.colors import get_color +from .. types.colors import get_color from .. types.sources import get_source from .. types.targets import get_target diff --git a/src/panels/id_mask_editor.py b/src/panels/id_mask_editor.py index dd4b7ba..549fdd8 100644 --- a/src/panels/id_mask_editor.py +++ b/src/panels/id_mask_editor.py @@ -1,14 +1,14 @@ import bpy -from src.menu.id_mask_editor_options import IDEDITOR_IDMaskEditorOptionsMenu -from src.operators.create_id_mask import CreateIDMaskOperator -from src.operators.id_editor_apply_color import IDEDITOR_ColorApplyOperator -from src.operators.id_editor_create_id import IDEDITOR_CreateIDOperator -from src.operators.id_editor_paint import IDEDITOR_PaintIDMaskOperator -from src.operators.id_editor_remove_id import IDEDITOR_RemoveIDOperator -from src.operators.id_editor_revert_color import IDEDITOR_ColorResetOperator -from src.operators.id_mask_select import IDEDITOR_SelectIDMaskOperator -from src.types.colors import get_color +from .. menu.id_mask_editor_options import IDEDITOR_IDMaskEditorOptionsMenu +from .. operators.create_id_mask import CreateIDMaskOperator +from .. operators.id_editor_apply_color import IDEDITOR_ColorApplyOperator +from .. operators.id_editor_create_id import IDEDITOR_CreateIDOperator +from .. operators.id_editor_paint import IDEDITOR_PaintIDMaskOperator +from .. operators.id_editor_remove_id import IDEDITOR_RemoveIDOperator +from .. operators.id_editor_revert_color import IDEDITOR_ColorResetOperator +from .. operators.id_mask_select import IDEDITOR_SelectIDMaskOperator +from .. types.colors import get_color class IDMaskEditorPanel(bpy.types.Panel): diff --git a/src/panels/id_mask_editor_id_list.py b/src/panels/id_mask_editor_id_list.py index 44042be..8afff75 100644 --- a/src/panels/id_mask_editor_id_list.py +++ b/src/panels/id_mask_editor_id_list.py @@ -1,9 +1,7 @@ import bpy -from src.operators.id_editor_apply_color import IDEDITOR_ColorApplyOperator -from src.operators.id_editor_find_used_ids import IDEDITOR_FindUsedIDsOperator -from src.operators.id_editor_paint import IDEDITOR_PaintIDMaskOperator -from src.operators.id_editor_revert_color import IDEDITOR_ColorResetOperator +from .. operators.id_editor_apply_color import IDEDITOR_ColorApplyOperator +from .. operators.id_editor_revert_color import IDEDITOR_ColorResetOperator class IDMaskEditorIDList(bpy.types.UIList): diff --git a/src/properties/bake_properties.py b/src/properties/bake_properties.py index 4b9d030..c46f0aa 100644 --- a/src/properties/bake_properties.py +++ b/src/properties/bake_properties.py @@ -1,9 +1,9 @@ from bpy.types import (PropertyGroup, Palette) from bpy.props import (EnumProperty, BoolProperty, IntProperty, StringProperty, PointerProperty) -from src.types.colors import get_color_enum -from src.types.sources import get_source_enum -from src.types.targets import get_targets_enum +from .. types.colors import get_color_enum +from .. types.sources import get_source_enum +from .. types.targets import get_targets_enum class BakeToIDProperties(PropertyGroup): diff --git a/src/properties/id_mask_editor_properties.py b/src/properties/id_mask_editor_properties.py index 44b4461..5d7a8ef 100644 --- a/src/properties/id_mask_editor_properties.py +++ b/src/properties/id_mask_editor_properties.py @@ -3,8 +3,8 @@ import bpy from bpy.types import (PropertyGroup, Palette, FloatColorAttribute) from bpy.props import (EnumProperty, BoolProperty, IntProperty, StringProperty, PointerProperty, CollectionProperty) -from src.properties.id_mask_editor_value_properties import IDMaskEditorValueProperties -from src.types.colors import get_color_enum +from .. properties.id_mask_editor_value_properties import IDMaskEditorValueProperties +from .. types.colors import get_color_enum def on_target_attribute_set(self, value): return None