diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-12-07 20:00:03 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-12-07 20:00:03 +0300 |
commit | dc848e9a8b6486ea83461c67c068a9ae8ac154ae (patch) | |
tree | 2cd74e4b46f24370a900bcbfbdfa0acc30d9e3cc /release/scripts/startup/bl_ui/space_image.py | |
parent | 1c0905be0f6c36524adeb43237d9541bb1e6dc1e (diff) | |
parent | 237df2f86053e796da98c903185ec3d70ae13910 (diff) |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'release/scripts/startup/bl_ui/space_image.py')
-rw-r--r-- | release/scripts/startup/bl_ui/space_image.py | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index dfc164592b7..123e95c013c 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -552,6 +552,7 @@ from .properties_mask_common import ( MASK_PT_point, MASK_PT_display, MASK_PT_tools, + MASK_PT_add, ) @@ -580,6 +581,20 @@ class IMAGE_PT_active_mask_point(MASK_PT_point, Panel): bl_region_type = 'UI' +class IMAGE_PT_tools_mask(MASK_PT_tools, Panel): + bl_space_type = 'IMAGE_EDITOR' + bl_region_type = 'TOOLS' + bl_category = 'Mask' + +class IMAGE_PT_tools_mask_add(MASK_PT_add, Panel): + bl_space_type = 'IMAGE_EDITOR' + bl_region_type = 'TOOLS' + bl_category = 'Mask' + + +# --- end mask --- + + class IMAGE_PT_image_properties(Panel): bl_space_type = 'IMAGE_EDITOR' bl_region_type = 'UI' @@ -1158,12 +1173,6 @@ class IMAGE_PT_uv_sculpt(Panel, ImagePaintPanel): col.prop(uvsculpt, "show_brush") -class IMAGE_PT_tools_mask(MASK_PT_tools, Panel): - bl_space_type = 'IMAGE_EDITOR' - bl_region_type = 'TOOLS' - bl_category = 'Mask' - -# --- end mask --- class IMAGE_PT_options_uvs(Panel, UVToolsPanel): @@ -1348,6 +1357,7 @@ classes = ( IMAGE_HT_header, MASK_MT_editor_menus, IMAGE_PT_mask, + IMAGE_PT_tools_mask_add, IMAGE_PT_mask_layers, IMAGE_PT_mask_display, IMAGE_PT_active_mask_spline, |