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/properties_object.py | |
| parent | a8553c9fa2482ca1a19bcf96edec2e8a3d261d86 (diff) | |
| parent | ebb29200d3bf9460ff32100cc1ed6c436e206829 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_object.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_object.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index dc14396a285..a77dad506f1 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -323,10 +323,10 @@ class OBJECT_PT_duplication(ObjectButtonsPanel, Panel): layout.prop(ob, "dupli_group", text="Group") -from bl_ui.properties_animviz import ( - MotionPathButtonsPanel, - OnionSkinButtonsPanel, - ) +from .properties_animviz import ( + MotionPathButtonsPanel, + OnionSkinButtonsPanel, +) class OBJECT_PT_motion_paths(MotionPathButtonsPanel, Panel): |