blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

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.
This commit is contained in:
Sergey Sharybin 2013-12-02 18:04:46 +06:00
parent 8cc229da93
commit 4ac17b3f0c
Notes: blender-bot 2023-02-14 11:32:13 +01:00 
Referenced by issue #37671, Edit Texture Space on Skin Resize crash
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/include/ED_transform.h
View File

@ -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);

4
source/blender/editors/transform/transform_ops.c
View File

@ -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)