[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48642] trunk/blender/source/blender/ editors/object/object_relations.c: code cleanup: replace magic numbers with enum.

[Campbell Barton]

Revision: 48642
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48642
Author:   campbellbarton
Date:     2012-07-05 12:09:43 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
code cleanup: replace magic numbers with enum.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_relations.c

Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c	2012-07-05 11:45:28 UTC (rev 48641)
+++ trunk/blender/source/blender/editors/object/object_relations.c	2012-07-05 12:09:43 UTC (rev 48642)
@@ -1732,6 +1732,13 @@
 	/* nodetree? XXX */
 }
 
+enum {
+	MAKE_LOCAL_SELECT_OB,
+	MAKE_LOCAL_SELECT_OBDATA,
+	MAKE_LOCAL_SELECT_OBDATA_MATERIAL,
+	MAKE_LOCAL_ALL
+};
+
 static int make_local_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
@@ -1770,7 +1777,7 @@
 	{
 		id = ob->data;
 			
-		if (id && (mode == 2 || mode == 3)) {
+		if (id && (ELEM(mode, MAKE_LOCAL_SELECT_OBDATA, MAKE_LOCAL_SELECT_OBDATA_MATERIAL))) {
 			id_make_local(id, 0);
 			adt = BKE_animdata_from_id(id);
 			if (adt) BKE_animdata_make_local(adt);
@@ -1794,7 +1801,7 @@
 	}
 	CTX_DATA_END;
 
-	if (mode == 3) {
+	if (mode == MAKE_LOCAL_SELECT_OBDATA_MATERIAL) {
 		CTX_DATA_BEGIN (C, Object *, ob, selected_objects)
 		{
 			if (ob->type == OB_LAMP) {
@@ -1832,11 +1839,12 @@
 void OBJECT_OT_make_local(wmOperatorType *ot)
 {
 	static EnumPropertyItem type_items[] = {
-		{1, "SELECTED_OBJECTS", 0, "Selected Objects", ""},
-		{2, "SELECTED_OBJECTS_DATA", 0, "Selected Objects and Data", ""},
-		{3, "SELECTED_OBJECTS_DATA_MAT", 0, "Selected Objects, Data and Materials", ""},
-		{4, "ALL", 0, "All", ""},
-		{0, NULL, 0, NULL, NULL}};
+		{MAKE_LOCAL_SELECT_OB, "SELECT_OBJECT", 0, "Selected Objects", ""},
+		{MAKE_LOCAL_SELECT_OBDATA, "SELECT_OBDATA", 0, "Selected Objects and Data", ""},
+		{MAKE_LOCAL_SELECT_OBDATA_MATERIAL, "SELECT_OBDATA_MATERIAL", 0, "Selected Objects, Data and Materials", ""},
+		{MAKE_LOCAL_ALL, "ALL", 0, "All", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	/* identifiers */
 	ot->name = "Make Local";