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.py | |
| parent | a8553c9fa2482ca1a19bcf96edec2e8a3d261d86 (diff) | |
| parent | ebb29200d3bf9460ff32100cc1ed6c436e206829 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/startup/bl_ui/space_view3d.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 0fd2e5296e4..da1db6836c6 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -19,11 +19,11 @@ # <pep8 compliant> import bpy from bpy.types import Header, Menu, Panel -from bl_ui.properties_grease_pencil_common import ( +from .properties_grease_pencil_common import ( GreasePencilDataPanel, GreasePencilPaletteColorPanel, ) -from bl_ui.properties_paint_common import UnifiedPaintPanel +from .properties_paint_common import UnifiedPaintPanel from bpy.app.translations import contexts as i18n_contexts |