[Bf-blender-cvs] [30b7aaf] master: Correct default enum values

Campbell Barton noreply at git.blender.org
Tue Jul 7 16:52:33 CEST 2015


Commit: 30b7aafe33742f994c37d9abef6c128f2891c845
Author: Campbell Barton
Date:   Tue Jul 7 23:09:08 2015 +1000
Branches: master
https://developer.blender.org/rB30b7aafe33742f994c37d9abef6c128f2891c845

Correct default enum values

Had assert creating cheat sheet

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

M	source/blender/editors/armature/armature_select.c
M	source/blender/editors/mesh/editmesh_select.c

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

diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c
index 5aa2c62..f457510 100644
--- a/source/blender/editors/armature/armature_select.c
+++ b/source/blender/editors/armature/armature_select.c
@@ -910,7 +910,7 @@ void ARMATURE_OT_select_similar(wmOperatorType *ot)
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
 	/* properties */
-	ot->prop = RNA_def_enum(ot->srna, "type", prop_similar_types, 0, "Type", "");
+	ot->prop = RNA_def_enum(ot->srna, "type", prop_similar_types, SIMEDBONE_LENGTH, "Type", "");
 	RNA_def_float(ot->srna, "threshold", 0.1f, 0.0f, 1.0f, "Threshold", "", 0.0f, 1.0f);
 }
 
diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c
index 27c43f9..8c2bc15 100644
--- a/source/blender/editors/mesh/editmesh_select.c
+++ b/source/blender/editors/mesh/editmesh_select.c
@@ -1173,7 +1173,7 @@ static EnumPropertyItem *select_similar_type_itemf(bContext *C, PointerRNA *UNUS
 		return item;
 	}
 
-	return NULL;
+	return prop_similar_types;
 }
 
 void MESH_OT_select_similar(wmOperatorType *ot)




More information about the Bf-blender-cvs mailing list