diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-10-21 04:43:17 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-21 04:43:17 +0300 |
commit | b66728d63deee0fc9ef517405466d1139871251d (patch) | |
tree | 03b92d528c53e48434d4e6361ecfc1b7607d2f56 /release/scripts/startup/bl_ui/space_view3d_toolbar.py | |
parent | a8553c9fa2482ca1a19bcf96edec2e8a3d261d86 (diff) | |
parent | ebb29200d3bf9460ff32100cc1ed6c436e206829 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/startup/bl_ui/space_view3d_toolbar.py')
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 88e6f5df86b..134a91a8c1f 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -19,20 +19,20 @@ # <pep8 compliant> import bpy from bpy.types import Menu, Panel, UIList -from bl_ui.properties_grease_pencil_common import ( - GreasePencilDrawingToolsPanel, - GreasePencilStrokeEditPanel, - GreasePencilInterpolatePanel, - GreasePencilStrokeSculptPanel, - GreasePencilBrushPanel, - GreasePencilBrushCurvesPanel - ) -from bl_ui.properties_paint_common import ( - UnifiedPaintPanel, - brush_texture_settings, - brush_texpaint_common, - brush_mask_texture_settings, - ) +from .properties_grease_pencil_common import ( + GreasePencilDrawingToolsPanel, + GreasePencilStrokeEditPanel, + GreasePencilInterpolatePanel, + GreasePencilStrokeSculptPanel, + GreasePencilBrushPanel, + GreasePencilBrushCurvesPanel +) +from .properties_paint_common import ( + UnifiedPaintPanel, + brush_texture_settings, + brush_texpaint_common, + brush_mask_texture_settings, +) class View3DPanel: |