[Bf-blender-cvs] [c46463e] master: Code Cleanup: use ELEM macro when checking object type

[Campbell Barton]

Commit: c46463eb3f66022533f4741e1dc4fb3d47475bfd
Author: Campbell Barton
Date:   Mon Dec 9 17:07:59 2013 +1100
http://developer.blender.org/rBc46463eb3f66022533f4741e1dc4fb3d47475bfd

Code Cleanup: use ELEM macro when checking object type

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

M       source/blender/blenkernel/intern/object.c
M       source/blender/editors/object/object_relations.c

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

diff --git a/source/blender/blenkernel/intern/object.c 
b/source/blender/blenkernel/intern/object.c
index 24e4b17..b730378 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -942,7 +942,7 @@ Object *BKE_object_add_only_object(Main *bmain, int type, 
const char *name)
        ob->empty_drawtype = OB_PLAINAXES;
        ob->empty_drawsize = 1.0;
 
-       if (type == OB_CAMERA || type == OB_LAMP || type == OB_SPEAKER) {
+       if (ELEM3(type, OB_LAMP, OB_CAMERA, OB_SPEAKER)) {
                ob->trackflag = OB_NEGZ;
                ob->upflag = OB_POSY;
        }
diff --git a/source/blender/editors/object/object_relations.c 
b/source/blender/editors/object/object_relations.c
index c70a70c..b3a2a7b 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -1192,8 +1192,9 @@ static int track_set_exec(bContext *C, wmOperator *op)
                                DAG_id_tag_update(&ob->id, OB_RECALC_OB | 
OB_RECALC_DATA | OB_RECALC_TIME);
                                
                                /* Lamp, Camera and Speaker track differently 
by default */
-                               if (ob->type == OB_LAMP || ob->type == 
OB_CAMERA || ob->type == OB_SPEAKER)
+                               if (ELEM3(ob->type, OB_LAMP, OB_CAMERA, 
OB_SPEAKER)) {
                                        data->trackflag = TRACK_nZ;
+                               }
                        }
                }
                CTX_DATA_END;
@@ -1212,7 +1213,7 @@ static int track_set_exec(bContext *C, wmOperator *op)
                                DAG_id_tag_update(&ob->id, OB_RECALC_OB | 
OB_RECALC_DATA | OB_RECALC_TIME);
                                
                                /* Lamp, Camera and Speaker track differently 
by default */
-                               if (ob->type == OB_LAMP || ob->type == 
OB_CAMERA || ob->type == OB_SPEAKER) {
+                               if (ELEM3(ob->type, OB_LAMP, OB_CAMERA, 
OB_SPEAKER)) {
                                        data->reserved1 = TRACK_nZ;
                                        data->reserved2 = UP_Y;
                                }
@@ -1234,7 +1235,7 @@ static int track_set_exec(bContext *C, wmOperator *op)
                                DAG_id_tag_update(&ob->id, OB_RECALC_OB | 
OB_RECALC_DATA | OB_RECALC_TIME);
                                
                                /* Lamp, Camera and Speaker track differently 
by default */
-                               if (ob->type == OB_LAMP || ob->type == 
OB_CAMERA || ob->type == OB_SPEAKER) {
+                               if (ELEM3(ob->type, OB_LAMP, OB_CAMERA, 
OB_SPEAKER)) {
                                        data->trackflag = TRACK_nZ;
                                        data->lockflag = LOCK_Y;
                                }

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