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_texture.py | |
parent | a8553c9fa2482ca1a19bcf96edec2e8a3d261d86 (diff) | |
parent | ebb29200d3bf9460ff32100cc1ed6c436e206829 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_texture.py')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_texture.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py index 86863b93ce3..01c36347b56 100644 --- a/release/scripts/startup/bl_ui/properties_texture.py +++ b/release/scripts/startup/bl_ui/properties_texture.py @@ -33,7 +33,7 @@ from bpy.types import ( from rna_prop_ui import PropertyPanel -from bl_ui.properties_paint_common import brush_texture_settings +from .properties_paint_common import brush_texture_settings class TEXTURE_MT_specials(Menu): @@ -78,7 +78,7 @@ class TEXTURE_UL_texslots(UIList): layout.label(text="", icon_value=icon) -from bl_ui.properties_material import active_node_mat +from .properties_material import active_node_mat def context_tex_datablock(context): |