From 83da21ca4e6cc969e48742b1b1783882192a66b5 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 11 Jun 2019 16:08:32 +1000 Subject: Fix T65393: Error live editing UI scripts Disable relative imports for UI scripts. --- .../startup/bl_ui/properties_data_armature.py | 2 +- .../bl_ui/properties_grease_pencil_common.py | 2 +- .../startup/bl_ui/properties_material_gpencil.py | 2 +- release/scripts/startup/bl_ui/properties_object.py | 2 +- .../scripts/startup/bl_ui/properties_particle.py | 2 +- .../startup/bl_ui/properties_physics_cloth.py | 2 +- .../bl_ui/properties_physics_dynamicpaint.py | 2 +- .../startup/bl_ui/properties_physics_field.py | 2 +- .../startup/bl_ui/properties_physics_smoke.py | 2 +- .../startup/bl_ui/properties_physics_softbody.py | 2 +- release/scripts/startup/bl_ui/properties_render.py | 2 +- release/scripts/startup/bl_ui/properties_scene.py | 2 +- .../scripts/startup/bl_ui/properties_texture.py | 2 +- release/scripts/startup/bl_ui/space_clip.py | 4 ++-- release/scripts/startup/bl_ui/space_dopesheet.py | 4 ++-- release/scripts/startup/bl_ui/space_graph.py | 4 ++-- release/scripts/startup/bl_ui/space_image.py | 20 +++++++++--------- release/scripts/startup/bl_ui/space_nla.py | 4 ++-- release/scripts/startup/bl_ui/space_node.py | 10 ++++----- release/scripts/startup/bl_ui/space_sequencer.py | 4 ++-- .../startup/bl_ui/space_toolsystem_toolbar.py | 4 ++-- release/scripts/startup/bl_ui/space_view3d.py | 24 +++++++++++----------- .../scripts/startup/bl_ui/space_view3d_toolbar.py | 14 ++++++------- 23 files changed, 59 insertions(+), 59 deletions(-) (limited to 'release/scripts') diff --git a/release/scripts/startup/bl_ui/properties_data_armature.py b/release/scripts/startup/bl_ui/properties_data_armature.py index 9df767d50c7..d44af702d46 100644 --- a/release/scripts/startup/bl_ui/properties_data_armature.py +++ b/release/scripts/startup/bl_ui/properties_data_armature.py @@ -21,7 +21,7 @@ import bpy from bpy.types import Panel, Menu from rna_prop_ui import PropertyPanel -from .properties_animviz import ( +from bl_ui.properties_animviz import ( MotionPathButtonsPanel, MotionPathButtonsPanel_display, ) diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py index 06131942505..c5afc51aa30 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -241,7 +241,7 @@ class GreasePencilStrokeSculptPanel: layout.template_icon_view(settings, "sculpt_tool", show_labels=True) if not self.is_popover: - from .properties_paint_common import ( + from bl_ui.properties_paint_common import ( brush_basic_gpencil_sculpt_settings, ) brush_basic_gpencil_sculpt_settings(layout, context, brush) diff --git a/release/scripts/startup/bl_ui/properties_material_gpencil.py b/release/scripts/startup/bl_ui/properties_material_gpencil.py index b6668258c78..7cd68f34e9e 100644 --- a/release/scripts/startup/bl_ui/properties_material_gpencil.py +++ b/release/scripts/startup/bl_ui/properties_material_gpencil.py @@ -22,7 +22,7 @@ from bpy.types import Menu, Panel, UIList from rna_prop_ui import PropertyPanel from bl_ui.utils import PresetPanel -from .properties_grease_pencil_common import ( +from bl_ui.properties_grease_pencil_common import ( GreasePencilMaterialsPanel, ) diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index 526ec17f2cb..0e45f4c97ae 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -17,7 +17,7 @@ # ##### END GPL LICENSE BLOCK ##### # -from .properties_animviz import ( +from bl_ui.properties_animviz import ( MotionPathButtonsPanel, MotionPathButtonsPanel_display, ) diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index 00c4f0e8e01..5e8aa16c8e6 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -24,7 +24,7 @@ from bpy.app.translations import pgettext_iface as iface_ from bpy.app.translations import contexts as i18n_contexts from bl_ui.utils import PresetPanel -from .properties_physics_common import ( +from bl_ui.properties_physics_common import ( point_cache_ui, effector_weights_ui, basic_force_field_settings_ui, diff --git a/release/scripts/startup/bl_ui/properties_physics_cloth.py b/release/scripts/startup/bl_ui/properties_physics_cloth.py index 7463f10185d..b896e5f5408 100644 --- a/release/scripts/startup/bl_ui/properties_physics_cloth.py +++ b/release/scripts/startup/bl_ui/properties_physics_cloth.py @@ -23,7 +23,7 @@ from bpy.types import ( ) from bl_ui.utils import PresetPanel -from .properties_physics_common import ( +from bl_ui.properties_physics_common import ( point_cache_ui, effector_weights_ui, ) diff --git a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py index 5dd9800347f..2b8e488cbe9 100644 --- a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py +++ b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py @@ -22,7 +22,7 @@ from bpy.types import ( Panel, UIList, ) -from .properties_physics_common import ( +from bl_ui.properties_physics_common import ( point_cache_ui, effector_weights_ui, ) diff --git a/release/scripts/startup/bl_ui/properties_physics_field.py b/release/scripts/startup/bl_ui/properties_physics_field.py index c38dad25cf4..00dc068a51a 100644 --- a/release/scripts/startup/bl_ui/properties_physics_field.py +++ b/release/scripts/startup/bl_ui/properties_physics_field.py @@ -21,7 +21,7 @@ from bpy.types import ( Panel, ) -from .properties_physics_common import ( +from bl_ui.properties_physics_common import ( basic_force_field_settings_ui, basic_force_field_falloff_ui, ) diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py b/release/scripts/startup/bl_ui/properties_physics_smoke.py index 898e1f3804e..057e7ddf211 100644 --- a/release/scripts/startup/bl_ui/properties_physics_smoke.py +++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py @@ -22,7 +22,7 @@ import bpy from bpy.types import ( Panel, ) -from .properties_physics_common import ( +from bl_ui.properties_physics_common import ( point_cache_ui, effector_weights_ui, ) diff --git a/release/scripts/startup/bl_ui/properties_physics_softbody.py b/release/scripts/startup/bl_ui/properties_physics_softbody.py index 6157446fd5a..3b080822b95 100644 --- a/release/scripts/startup/bl_ui/properties_physics_softbody.py +++ b/release/scripts/startup/bl_ui/properties_physics_softbody.py @@ -21,7 +21,7 @@ from bpy.types import ( Panel, ) -from .properties_physics_common import ( +from bl_ui.properties_physics_common import ( point_cache_ui, effector_weights_ui, ) diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 41e3309d8cd..8734989a56f 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -19,7 +19,7 @@ # from bpy.types import Panel -from .space_view3d import ( +from bl_ui.space_view3d import ( VIEW3D_PT_shading_lighting, VIEW3D_PT_shading_color, VIEW3D_PT_shading_options, diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index df431000048..60a7751e910 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -26,7 +26,7 @@ from bpy.types import ( from rna_prop_ui import PropertyPanel -from .properties_physics_common import ( +from bl_ui.properties_physics_common import ( point_cache_ui, effector_weights_ui, ) diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py index 41c17831c2c..40a630ff834 100644 --- a/release/scripts/startup/bl_ui/properties_texture.py +++ b/release/scripts/startup/bl_ui/properties_texture.py @@ -32,7 +32,7 @@ from bpy.types import ( ) from rna_prop_ui import PropertyPanel -from .properties_paint_common import brush_texture_settings +from bl_ui.properties_paint_common import brush_texture_settings class TEXTURE_MT_context_menu(Menu): diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index e811619683e..d138615e9be 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -22,7 +22,7 @@ import bpy from bpy.types import Panel, Header, Menu, UIList from bpy.app.translations import pgettext_iface as iface_ from bl_ui.utils import PresetPanel -from .properties_grease_pencil_common import ( +from bl_ui.properties_grease_pencil_common import ( AnnotationDrawingToolsPanel, AnnotationDataPanel, ) @@ -1106,7 +1106,7 @@ class CLIP_PT_proxy(CLIP_PT_clip_view_panel, Panel): # ----------------------------------------------------------------------------- # Mask (similar code in space_image.py, keep in sync) -from .properties_mask_common import ( +from bl_ui.properties_mask_common import ( MASK_PT_mask, MASK_PT_layers, MASK_PT_spline, diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index 87bbb274e66..c0274a64bd0 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -199,7 +199,7 @@ class DOPESHEET_HT_header(Header): layout.template_header() if st.mode == 'TIMELINE': - from .space_time import ( + from bl_ui.space_time import ( TIME_MT_editor_menus, TIME_HT_editor_buttons, ) @@ -394,7 +394,7 @@ class DOPESHEET_MT_marker(Menu): def draw(self, context): layout = self.layout - from .space_time import marker_menu_generic + from bl_ui.space_time import marker_menu_generic marker_menu_generic(layout, context) st = context.space_data diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py index a5bc29362ec..422990760b4 100644 --- a/release/scripts/startup/bl_ui/space_graph.py +++ b/release/scripts/startup/bl_ui/space_graph.py @@ -19,7 +19,7 @@ # from bpy.types import Header, Menu, Panel -from .space_dopesheet import ( +from bl_ui.space_dopesheet import ( DopesheetFilterPopoverBase, dopesheet_filter, ) @@ -207,7 +207,7 @@ class GRAPH_MT_marker(Menu): def draw(self, context): layout = self.layout - from .space_time import marker_menu_generic + from bl_ui.space_time import marker_menu_generic marker_menu_generic(layout, context) # TODO: pose markers for action edit mode only? diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 6af3f8865ca..1a0bc03dd38 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -24,7 +24,7 @@ from bpy.types import ( Panel, UIList, ) -from .properties_paint_common import ( +from bl_ui.properties_paint_common import ( UnifiedPaintPanel, brush_texture_settings, brush_texpaint_common, @@ -34,10 +34,10 @@ from .properties_paint_common import ( brush_texpaint_common_options, brush_mask_texture_settings, ) -from .properties_grease_pencil_common import ( +from bl_ui.properties_grease_pencil_common import ( AnnotationDataPanel, ) -from .space_toolsystem_common import ( +from bl_ui.space_toolsystem_common import ( ToolActivePanelHelper, ) @@ -548,7 +548,7 @@ class IMAGE_HT_tool_header(Header): # Active Tool # ----------- - from .space_toolsystem_common import ToolSelectPanelHelper + from bl_ui.space_toolsystem_common import ToolSelectPanelHelper tool = ToolSelectPanelHelper.draw_active_tool_header(context, layout) tool_mode = context.mode if tool is None else tool.mode @@ -580,7 +580,7 @@ class IMAGE_HT_tool_header(Header): # Active Tool # ----------- - from .space_toolsystem_common import ToolSelectPanelHelper + from bl_ui.space_toolsystem_common import ToolSelectPanelHelper tool = ToolSelectPanelHelper.tool_active_from_context(context) tool_mode = context.mode if tool is None else tool.mode @@ -597,7 +597,7 @@ class _draw_tool_settings_context_mode: uv_sculpt = tool_settings.uv_sculpt brush = uv_sculpt.brush if brush: - from .properties_paint_common import UnifiedPaintPanel + from bl_ui.properties_paint_common import UnifiedPaintPanel row = layout.row(align=True) UnifiedPaintPanel.prop_unified_size(row, context, brush, "size", slider=True) @@ -619,7 +619,7 @@ class _draw_tool_settings_context_mode: if brush is None: return - from .properties_paint_common import ( + from bl_ui.properties_paint_common import ( UnifiedPaintPanel, brush_basic_texpaint_settings, ) @@ -770,7 +770,7 @@ class MASK_MT_editor_menus(Menu): # Mask (similar code in space_clip.py, keep in sync) # note! - panel placement does _not_ fit well with image panels... need to fix. -from .properties_mask_common import ( +from bl_ui.properties_mask_common import ( MASK_PT_mask, MASK_PT_layers, MASK_PT_spline, @@ -1407,14 +1407,14 @@ class IMAGE_PT_uv_sculpt_brush(Panel): sima = context.space_data # TODO(campbell): nicer way to check if we're in uv sculpt mode. if sima and sima.show_uvedit: - from .space_toolsystem_common import ToolSelectPanelHelper + from bl_ui.space_toolsystem_common import ToolSelectPanelHelper tool = ToolSelectPanelHelper.tool_active_from_context(context) if tool.has_datablock: return True return False def draw(self, context): - from .properties_paint_common import UnifiedPaintPanel + from bl_ui.properties_paint_common import UnifiedPaintPanel layout = self.layout tool_settings = context.tool_settings diff --git a/release/scripts/startup/bl_ui/space_nla.py b/release/scripts/startup/bl_ui/space_nla.py index d4d8fe2dae0..06bd69928d8 100644 --- a/release/scripts/startup/bl_ui/space_nla.py +++ b/release/scripts/startup/bl_ui/space_nla.py @@ -20,7 +20,7 @@ from bpy.types import Header, Menu, Panel from bpy.app.translations import contexts as i18n_contexts -from .space_dopesheet import ( +from bl_ui.space_dopesheet import ( DopesheetFilterPopoverBase, dopesheet_filter, ) @@ -143,7 +143,7 @@ class NLA_MT_marker(Menu): def draw(self, context): layout = self.layout - from .space_time import marker_menu_generic + from bl_ui.space_time import marker_menu_generic marker_menu_generic(layout, context) diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index 1c066cded06..c65893ae280 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -23,21 +23,21 @@ from bpy.types import Header, Menu, Panel from bpy.app.translations import pgettext_iface as iface_ from bpy.app.translations import contexts as i18n_contexts from bl_ui.utils import PresetPanel -from .properties_grease_pencil_common import ( +from bl_ui.properties_grease_pencil_common import ( AnnotationDataPanel, GreasePencilToolsPanel, ) -from .space_toolsystem_common import ( +from bl_ui.space_toolsystem_common import ( ToolActivePanelHelper, ) -from .properties_material import ( +from bl_ui.properties_material import ( EEVEE_MATERIAL_PT_settings, MATERIAL_PT_viewport ) -from .properties_world import ( +from bl_ui.properties_world import ( WORLD_PT_viewport_display ) -from .properties_data_light import ( +from bl_ui.properties_data_light import ( DATA_PT_light, DATA_PT_EEVEE_light, ) diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 558a188bf97..a9ca3f9dd5d 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -27,7 +27,7 @@ from bpy.app.translations import ( contexts as i18n_contexts, pgettext_iface as iface_, ) -from .properties_grease_pencil_common import ( +from bl_ui.properties_grease_pencil_common import ( AnnotationDataPanel, GreasePencilToolsPanel, ) @@ -362,7 +362,7 @@ class SEQUENCER_MT_marker(Menu): st = context.space_data is_sequencer_view = st.view_type in {'SEQUENCER', 'SEQUENCER_PREVIEW'} - from .space_time import marker_menu_generic + from bl_ui.space_time import marker_menu_generic marker_menu_generic(layout, context) if is_sequencer_view: diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 5bfd3410e19..59d38cc8ae4 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -27,7 +27,7 @@ import bpy from bpy.types import Panel -from .space_toolsystem_common import ( +from bl_ui.space_toolsystem_common import ( ToolSelectPanelHelper, ToolDef, ) @@ -1072,7 +1072,7 @@ class _defs_weight_paint: def draw_settings(context, layout, tool): brush = context.tool_settings.weight_paint.brush if brush is not None: - from .properties_paint_common import UnifiedPaintPanel + from bl_ui.properties_paint_common import UnifiedPaintPanel UnifiedPaintPanel.prop_unified_weight(layout, context, brush, "weight", slider=True) UnifiedPaintPanel.prop_unified_strength(layout, context, brush, "strength", slider=True) props = tool.operator_properties("paint.weight_gradient") diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index aec267f344a..bc1192cd223 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -23,15 +23,15 @@ from bpy.types import ( Menu, Panel, ) -from .properties_paint_common import ( +from bl_ui.properties_paint_common import ( UnifiedPaintPanel, ) -from .properties_grease_pencil_common import ( +from bl_ui.properties_grease_pencil_common import ( AnnotationDataPanel, AnnotationOnionSkin, GreasePencilMaterialsPanel, ) -from .space_toolsystem_common import ( +from bl_ui.space_toolsystem_common import ( ToolActivePanelHelper, ) from bpy.app.translations import contexts as i18n_contexts @@ -62,7 +62,7 @@ class VIEW3D_HT_tool_header(Header): # Active Tool # ----------- - from .space_toolsystem_common import ToolSelectPanelHelper + from bl_ui.space_toolsystem_common import ToolSelectPanelHelper tool = ToolSelectPanelHelper.draw_active_tool_header( context, layout, tool_key=('VIEW_3D', tool_mode), @@ -225,7 +225,7 @@ class _draw_tool_settings_context_mode: if brush is None: return - from .properties_paint_common import ( + from bl_ui.properties_paint_common import ( brush_basic_sculpt_settings, ) brush_basic_sculpt_settings(layout, context, brush, compact=True) @@ -242,7 +242,7 @@ class _draw_tool_settings_context_mode: if brush is None: return - from .properties_paint_common import ( + from bl_ui.properties_paint_common import ( UnifiedPaintPanel, brush_basic_texpaint_settings, ) @@ -263,7 +263,7 @@ class _draw_tool_settings_context_mode: if brush is None: return - from .properties_paint_common import ( + from bl_ui.properties_paint_common import ( UnifiedPaintPanel, brush_basic_vpaint_settings, ) @@ -283,7 +283,7 @@ class _draw_tool_settings_context_mode: if brush is None: return - from .properties_paint_common import brush_basic_wpaint_settings + from bl_ui.properties_paint_common import brush_basic_wpaint_settings brush_basic_wpaint_settings(layout, context, brush, compact=True) @staticmethod @@ -343,7 +343,7 @@ class _draw_tool_settings_context_mode: if context.object and brush.gpencil_tool in {'FILL', 'DRAW'}: draw_color_selector() - from .properties_paint_common import ( + from bl_ui.properties_paint_common import ( brush_basic_gpencil_paint_settings, ) brush_basic_gpencil_paint_settings(layout, context, brush, compact=True) @@ -377,7 +377,7 @@ class _draw_tool_settings_context_mode: settings = tool_settings.gpencil_sculpt brush = settings.brush - from .properties_paint_common import ( + from bl_ui.properties_paint_common import ( brush_basic_gpencil_sculpt_settings, ) brush_basic_gpencil_sculpt_settings(layout, context, brush, compact=True) @@ -390,7 +390,7 @@ class _draw_tool_settings_context_mode: settings = tool_settings.gpencil_sculpt brush = settings.brush - from .properties_paint_common import ( + from bl_ui.properties_paint_common import ( brush_basic_gpencil_weight_settings, ) brush_basic_gpencil_weight_settings(layout, context, brush, compact=True) @@ -482,7 +482,7 @@ class VIEW3D_HT_header(Header): show_snap = True else: - from .properties_paint_common import UnifiedPaintPanel + from bl_ui.properties_paint_common import UnifiedPaintPanel paint_settings = UnifiedPaintPanel.paint_settings(context) if paint_settings: diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 2893ea7873c..e7be73391b7 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -18,13 +18,13 @@ # from bpy.types import Menu, Panel, UIList -from .properties_grease_pencil_common import ( +from bl_ui.properties_grease_pencil_common import ( GreasePencilStrokeEditPanel, GreasePencilStrokeSculptPanel, GreasePencilSculptOptionsPanel, GreasePencilAppearancePanel, ) -from .properties_paint_common import ( +from bl_ui.properties_paint_common import ( UnifiedPaintPanel, brush_mask_texture_settings, brush_texpaint_common, @@ -304,7 +304,7 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel): # Sculpt Mode # if context.sculpt_object and brush: - from .properties_paint_common import ( + from bl_ui.properties_paint_common import ( brush_basic_sculpt_settings, ) @@ -388,7 +388,7 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel): # Weight Paint Mode # elif context.weight_paint_object and brush: - from .properties_paint_common import ( + from bl_ui.properties_paint_common import ( brush_basic_wpaint_settings, ) @@ -399,7 +399,7 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel): # Vertex Paint Mode # elif context.vertex_paint_object and brush: - from .properties_paint_common import ( + from bl_ui.properties_paint_common import ( brush_basic_vpaint_settings, ) @@ -1740,7 +1740,7 @@ class VIEW3D_PT_tools_grease_pencil_brush(View3DPanel, Panel): row.prop(gp_settings, "use_material_pin", text="") if not self.is_popover: - from .properties_paint_common import ( + from bl_ui.properties_paint_common import ( brush_basic_gpencil_paint_settings, ) brush_basic_gpencil_paint_settings(layout, context, brush, compact=True) @@ -2051,7 +2051,7 @@ class VIEW3D_PT_tools_grease_pencil_weight_paint(View3DPanel, Panel): col = layout.column() if not self.is_popover: - from .properties_paint_common import ( + from bl_ui.properties_paint_common import ( brush_basic_gpencil_weight_settings, ) brush_basic_gpencil_weight_settings(col, context, brush) -- cgit v1.2.3