Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-08-01 14:50:39 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-08-01 14:50:39 +0400
commit26cc3dd7086d7e0061322f5b6f29ce10fb9d8abb (patch)
tree831493412b0fa80ded28b294ab6e4a88602197c6 /release/scripts
parent0fee289551e90865e9f2041d49f19f5a8c065304 (diff)
misc mask fixes
- image space used wrong notifiers. - image notifier now checks for mask mode before listening to mask edits. - mask keyframes now draw in the image space.
Diffstat (limited to 'release/scripts')
-rw-r--r--release/scripts/startup/bl_ui/space_image.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index e86c18aeba2..7752eb9771a 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -356,6 +356,7 @@ class IMAGE_HT_header(Header):
show_render = sima.show_render
# show_paint = sima.show_paint
show_uvedit = sima.show_uvedit
+ show_maskedit = sima.show_maskedit
row = layout.row(align=True)
row.template_header()
@@ -407,7 +408,7 @@ class IMAGE_HT_header(Header):
mesh = context.edit_object.data
layout.prop_search(mesh.uv_textures, "active", mesh, "uv_textures", text="")
- elif mode == 'MASK':
+ if show_maskedit:
row = layout.row()
row.template_ID(sima, "mask", new="mask.new")