[Bf-blender-cvs] [6b40a4b] master: Fix T44794: Blend From Shape tool X Icon UI Bug?
Bastien Montagne
noreply at git.blender.org
Thu May 21 12:02:11 CEST 2015
Commit: 6b40a4bcb1bcd82bf21e0a3473f8aacc11727b24
Author: Bastien Montagne
Date: Thu May 21 12:00:31 2015 +0200
Branches: master
https://developer.blender.org/rB6b40a4bcb1bcd82bf21e0a3473f8aacc11727b24
Fix T44794: Blend From Shape tool X Icon UI Bug?
Note: maybe we could even make `RNA_property_is_unlink()` always return false
for enum properties? But well, guess being explicit here does not hurt...
===================================================================
M source/blender/editors/mesh/editmesh_tools.c
===================================================================
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index f023aec..7f595a8 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -2489,7 +2489,7 @@ void MESH_OT_blend_from_shape(wmOperatorType *ot)
/* properties */
prop = RNA_def_enum(ot->srna, "shape", DummyRNA_NULL_items, 0, "Shape", "Shape key to use for blending");
RNA_def_enum_funcs(prop, shape_itemf);
- RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE);
+ RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE | PROP_NEVER_UNLINK);
RNA_def_float(ot->srna, "blend", 1.0f, -FLT_MAX, FLT_MAX, "Blend", "Blending factor", -2.0f, 2.0f);
RNA_def_boolean(ot->srna, "add", 1, "Add", "Add rather than blend between shapes");
}
More information about the Bf-blender-cvs
mailing list