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_node.py | |
| parent | a8553c9fa2482ca1a19bcf96edec2e8a3d261d86 (diff) | |
| parent | ebb29200d3bf9460ff32100cc1ed6c436e206829 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/startup/bl_ui/space_node.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_node.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index 335ef67c847..200fc415f8a 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -21,16 +21,16 @@ import bpy import nodeitems_utils from bpy.types import Header, Menu, Panel from bpy.app.translations import pgettext_iface as iface_ -from bl_ui.properties_grease_pencil_common import ( - GreasePencilDrawingToolsPanel, - GreasePencilStrokeEditPanel, - GreasePencilStrokeSculptPanel, - GreasePencilBrushPanel, - GreasePencilBrushCurvesPanel, - GreasePencilDataPanel, - GreasePencilPaletteColorPanel, - GreasePencilToolsPanel - ) +from .properties_grease_pencil_common import ( + GreasePencilDrawingToolsPanel, + GreasePencilStrokeEditPanel, + GreasePencilStrokeSculptPanel, + GreasePencilBrushPanel, + GreasePencilBrushCurvesPanel, + GreasePencilDataPanel, + GreasePencilPaletteColorPanel, + GreasePencilToolsPanel +) class NODE_HT_header(Header): |