[Bf-blender-cvs] [4ac17b3] master: Fix T37671: Edit Texture Space on Skin Resize crash

[Sergey Sharybin]

Commit: 4ac17b3f0ca8c538ff0ad82899dfcb374ed5f280
Author: Sergey Sharybin
Date:   Mon Dec 2 18:04:46 2013 +0600
http://developer.blender.org/rB4ac17b3f0ca8c538ff0ad82899dfcb374ed5f280

Fix T37671: Edit Texture Space on Skin Resize crash

Texture space editing from TFM_SKIN_RESIZE is not supported,
so hide the option and don't use it for such a transform.

===================================================================

M       source/blender/editors/include/ED_transform.h
M       source/blender/editors/transform/transform_ops.c

===================================================================

diff --git a/source/blender/editors/include/ED_transform.h 
b/source/blender/editors/include/ED_transform.h
index 6e5c2aa..35f12a4 100644
--- a/source/blender/editors/include/ED_transform.h
+++ b/source/blender/editors/include/ED_transform.h
@@ -144,6 +144,7 @@ int BIF_countTransformOrientation(const struct bContext *C);
 #define P_OPTIONS       (1 << 7)
 #define P_CORRECT_UV    (1 << 8)
 #define P_NO_DEFAULTS   (1 << 10)
+#define P_NO_TEXSPACE   (1 << 11)
 
 void Transform_Properties(struct wmOperatorType *ot, int flags);
 
diff --git a/source/blender/editors/transform/transform_ops.c 
b/source/blender/editors/transform/transform_ops.c
index 4f2aebf..3a83445 100644
--- a/source/blender/editors/transform/transform_ops.c
+++ b/source/blender/editors/transform/transform_ops.c
@@ -533,7 +533,7 @@ void Transform_Properties(struct wmOperatorType *ot, int 
flags)
                }
        }
 
-       if (flags & P_OPTIONS) {
+       if ((flags & P_OPTIONS) && !(flags & P_NO_TEXSPACE)) {
                RNA_def_boolean(ot->srna, "texture_space", 0, "Edit Texture 
Space", "Edit Object data texture space");
                prop = RNA_def_boolean(ot->srna, "remove_on_cancel", 0, "Remove 
on Cancel", "Remove elements on cancel");
                RNA_def_property_flag(prop, PROP_HIDDEN);
@@ -617,7 +617,7 @@ static void TRANSFORM_OT_skin_resize(struct wmOperatorType 
*ot)
 
        RNA_def_float_vector(ot->srna, "value", 3, VecOne, -FLT_MAX, FLT_MAX, 
"Vector", "", -FLT_MAX, FLT_MAX);
 
-       Transform_Properties(ot, P_CONSTRAINT | P_PROPORTIONAL | P_MIRROR | 
P_GEO_SNAP | P_OPTIONS);
+       Transform_Properties(ot, P_CONSTRAINT | P_PROPORTIONAL | P_MIRROR | 
P_GEO_SNAP | P_OPTIONS | P_NO_TEXSPACE);
 }
 
 static void TRANSFORM_OT_trackball(struct wmOperatorType *ot)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs