[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51770] trunk/blender/source/blender: style cleanup & re-use DNA pad var with new collision group object settings .

[Campbell Barton]

Revision: 51770
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51770
Author:   campbellbarton
Date:     2012-10-30 16:33:40 +0000 (Tue, 30 Oct 2012)
Log Message:
-----------
style cleanup & re-use DNA pad var with new collision group object settings.

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/DNA_object_types.h
    trunk/blender/source/blender/makesrna/intern/rna_object.c

Modified: trunk/blender/source/blender/makesdna/DNA_object_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_object_types.h	2012-10-30 15:44:16 UTC (rev 51769)
+++ trunk/blender/source/blender/makesdna/DNA_object_types.h	2012-10-30 16:33:40 UTC (rev 51770)
@@ -209,8 +209,10 @@
 	float step_height;
 	float jump_speed;
 	float fall_speed;
-	char pad1[4];
 
+	/** Collision mask settings */
+	unsigned short col_group, col_mask;
+
 	short rotmode;		/* rotation mode - uses defines set out in DNA_action_types.h for PoseChannel rotations... */
 
 	char boundtype;            /* bounding box use for drawing */
@@ -243,9 +245,6 @@
 	short recalc;			/* dependency flag */
 	float anisotropicFriction[3];
 
-	/** Collision mask settings */
-	unsigned short col_group, col_mask, col_pad[2];
-
 	ListBase constraints;		/* object constraints */
 	ListBase nlastrips  DNA_DEPRECATED;			// XXX deprecated... old animation system
 	ListBase hooks  DNA_DEPRECATED;				// XXX deprecated... old animation system

Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c	2012-10-30 15:44:16 UTC (rev 51769)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c	2012-10-30 16:33:40 UTC (rev 51770)
@@ -851,11 +851,11 @@
 	
 	if (value) {
 		ob->matbits[index] = 1;
-		/* ob->colbits |= (1<<index); */ /* DEPRECATED */
+		/* ob->colbits |= (1 << index); */ /* DEPRECATED */
 	}
 	else {
 		ob->matbits[index] = 0;
-		/* ob->colbits &= ~(1<<index); */ /* DEPRECATED */
+		/* ob->colbits &= ~(1 << index); */ /* DEPRECATED */
 	}
 }
 
@@ -1036,8 +1036,8 @@
 		return 0;
 
 	for (i = 0; i < 20; i++) {
-		if (values[i]) lay |= (1 << i);
-		else lay &= ~(1 << i);
+		if (values[i]) lay |=  (1 << i);
+		else           lay &= ~(1 << i);
 	}
 
 	return lay;
@@ -1072,8 +1072,9 @@
 	int all_states = (ob->scaflag & OB_ALLSTATE ? 1 : 0);
 
 	memset(values, 0, sizeof(int) * OB_MAX_STATES);
-	for (i = 0; i < OB_MAX_STATES; i++)
+	for (i = 0; i < OB_MAX_STATES; i++) {
 		values[i] = (ob->state & (1 << i)) | all_states;
+	}
 }
 
 static void rna_GameObjectSettings_state_set(PointerRNA *ptr, const int *values)
@@ -1116,8 +1117,9 @@
 	Object *ob = (Object*)ptr->data;
 	int i;
 
-	for (i = 0; i < OB_MAX_COL_MASKS; i++)
-		values[i] = (ob->col_group & (1<<i));
+	for (i = 0; i < OB_MAX_COL_MASKS; i++) {
+		values[i] = (ob->col_group & (1 << i));
+	}
 }
 
 static void rna_GameObjectSettings_col_group_set(PointerRNA *ptr, const int *values)
@@ -1127,15 +1129,15 @@
 
 	/* ensure we always have some group selected */
 	for (i = 0; i < OB_MAX_COL_MASKS; i++)
-		if(values[i])
+		if (values[i])
 			tot++;
 
-	if (tot==0)
+	if (tot == 0)
 		return;
 
 	for (i = 0; i < OB_MAX_COL_MASKS; i++) {
-		if (values[i]) ob->col_group |= (1<<i);
-		else ob->col_group &= ~(1<<i);
+		if (values[i]) ob->col_group |=  (1 << i);
+		else           ob->col_group &= ~(1 << i);
 	}
 }
 
@@ -1144,8 +1146,9 @@
 	Object *ob = (Object*)ptr->data;
 	int i;
 
-	for (i = 0; i < OB_MAX_COL_MASKS; i++)
-		values[i] = (ob->col_mask & (1<<i));
+	for (i = 0; i < OB_MAX_COL_MASKS; i++) {
+		values[i] = (ob->col_mask & (1 << i));
+	}
 }
 
 static void rna_GameObjectSettings_col_mask_set(PointerRNA *ptr, const int *values)
@@ -1155,15 +1158,15 @@
 
 	/* ensure we always have some mask selected */
 	for (i = 0; i < OB_MAX_COL_MASKS; i++)
-		if(values[i])
+		if (values[i])
 			tot++;
 
-	if (tot==0)
+	if (tot == 0)
 		return;
 
 	for (i = 0; i < OB_MAX_COL_MASKS; i++) {
-		if (values[i]) ob->col_mask |= (1<<i);
-		else ob->col_mask &= ~(1<<i);
+		if (values[i]) ob->col_mask |=  (1 << i);
+		else           ob->col_mask &= ~(1 << i);
 	}
 }
 
@@ -1513,8 +1516,6 @@
 	StructRNA *srna;
 	PropertyRNA *prop;
 
-	int default_col_mask[8] = {1,0,0,0,  0,0,0,0};
-
 	static EnumPropertyItem body_type_items[] = {
 		{OB_BODY_TYPE_NO_COLLISION, "NO_COLLISION", 0, "No Collision", "Disable collision for this object"},
 		{OB_BODY_TYPE_STATIC, "STATIC", 0, "Static", "Stationary object"},