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:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-02-17 10:58:50 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-02-17 10:58:50 +0400
commit1776cb92441b180c733ce13bbfcb1058bb46e6ae (patch)
tree4e27478d5d76a2583054a05d5111690bd090b492 /release
parent9c79fd1193e796c351f664724d8ab7232b57cde5 (diff)
Fix T38670: Mask transform without a movieclip crashes
Disable transform and mask display when there's no active clip. It's not a matter of returning fallback dimensions if there's no slip, it's also matter of making it so stabilization and distortion routines are aware of clip == NULL which is really crappy. Also almost all the operators are disabled in clip editor without active clip already anyway. Also tweaked header UI a bit to not display mask stuff when there's no active clip,
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_clip.py19
1 files changed, 10 insertions, 9 deletions
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py
index 42ad9daafa5..7ee46934a1c 100644
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@ -124,17 +124,18 @@ class CLIP_HT_header(Header):
layout.prop(sc, "mode", text="")
- row = layout.row()
- row.template_ID(sc, "mask", new="mask.new")
+ if clip:
+ row = layout.row()
+ row.template_ID(sc, "mask", new="mask.new")
- layout.prop(sc, "pivot_point", text="", icon_only=True)
+ layout.prop(sc, "pivot_point", text="", icon_only=True)
- row = layout.row(align=True)
- row.prop(toolsettings, "use_proportional_edit_mask",
- text="", icon_only=True)
- if toolsettings.use_proportional_edit_mask:
- row.prop(toolsettings, "proportional_edit_falloff",
- text="", icon_only=True)
+ row = layout.row(align=True)
+ row.prop(toolsettings, "use_proportional_edit_mask",
+ text="", icon_only=True)
+ if toolsettings.use_proportional_edit_mask:
+ row.prop(toolsettings, "proportional_edit_falloff",
+ text="", icon_only=True)
def draw(self, context):
layout = self.layout