[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32573] trunk/blender/source/blender: use unsigned int for all layers.

[Campbell Barton]

Revision: 32573
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32573
Author:   campbellbarton
Date:     2010-10-19 03:21:22 +0200 (Tue, 19 Oct 2010)

Log Message:
-----------
use unsigned int for all layers.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/depsgraph_private.h
    trunk/blender/source/blender/blenkernel/intern/anim.c
    trunk/blender/source/blender/blenkernel/intern/object.c
    trunk/blender/source/blender/editors/render/render_internal.c
    trunk/blender/source/blender/editors/space_view3d/space_view3d.c
    trunk/blender/source/blender/editors/space_view3d/view3d_header.c
    trunk/blender/source/blender/makesdna/DNA_armature_types.h
    trunk/blender/source/blender/makesdna/DNA_view3d_types.h

Modified: trunk/blender/source/blender/blenkernel/depsgraph_private.h
===================================================================
--- trunk/blender/source/blender/blenkernel/depsgraph_private.h	2010-10-19 00:45:37 UTC (rev 32572)
+++ trunk/blender/source/blender/blenkernel/depsgraph_private.h	2010-10-19 01:21:22 UTC (rev 32573)
@@ -64,8 +64,8 @@
 	void * ob;
 	void * first_ancestor;
 	int ancestor_count;
-	int lay;			// accumulated layers of its relations + itself
-	int scelay;			// layers due to being in scene
+	unsigned int lay;			// accumulated layers of its relations + itself
+	unsigned int scelay;			// layers due to being in scene
 	int lasttime;		// if lasttime != DagForest->time, this node was not evaluated yet for flushing
 	int BFS_dist;		// BFS distance
 	int DFS_dist;		// DFS distance

Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c	2010-10-19 00:45:37 UTC (rev 32572)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c	2010-10-19 01:21:22 UTC (rev 32573)
@@ -843,7 +843,8 @@
 	GroupObject * go = NULL;
 	EditMesh *em;
 	float vec[3], no[3], pmat[4][4];
-	int lay, totvert, a, oblay;
+	int totvert, a, oblay;
+	unsigned int lay;
 	
 	copy_m4_m4(pmat, par->obmat);
 	
@@ -1153,8 +1154,9 @@
 	float ctime, pa_time, scale = 1.0f;
 	float tmat[4][4], mat[4][4], pamat[4][4], vec[3], size=0.0;
 	float (*obmat)[4], (*oldobmat)[4];
-	int lay, a, b, counter, hair = 0;
+	int a, b, counter, hair = 0;
 	int totpart, totchild, totgroup=0, pa_num;
+	unsigned int lay;
 
 	if(psys==0) return;
 	

Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c	2010-10-19 00:45:37 UTC (rev 32572)
+++ trunk/blender/source/blender/blenkernel/intern/object.c	2010-10-19 01:21:22 UTC (rev 32573)
@@ -1476,7 +1476,7 @@
 {
 	bArmature *arm= ob->data;
 	bPoseChannel *pchan;
-	int lay= arm->layer_protected;
+	unsigned int lay= arm->layer_protected;
 	
 	for (pchan = ob->pose->chanbase.first; pchan; pchan=pchan->next) {
 		if(!(pchan->bone->layer & lay))

Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c	2010-10-19 00:45:37 UTC (rev 32572)
+++ trunk/blender/source/blender/editors/render/render_internal.c	2010-10-19 01:21:22 UTC (rev 32573)
@@ -401,7 +401,7 @@
 	Image *ima;
 	View3D *v3d= CTX_wm_view3d(C);
 	Main *mainp= CTX_data_main(C);
-	int lay= (v3d)? v3d->lay: scene->lay;
+	unsigned int lay= (v3d)? v3d->lay: scene->lay;
 
 	if(re==NULL) {
 		re= RE_NewRender(scene->id.name);

Modified: trunk/blender/source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/space_view3d.c	2010-10-19 00:45:37 UTC (rev 32572)
+++ trunk/blender/source/blender/editors/space_view3d/space_view3d.c	2010-10-19 01:21:22 UTC (rev 32573)
@@ -915,7 +915,7 @@
 	View3D *v3d= CTX_wm_view3d(C);
 	Scene *scene= CTX_data_scene(C);
 	Base *base;
-	int lay = v3d ? v3d->lay:scene->lay; /* fallback to the scene layer, allows duplicate and other oject operators to run outside the 3d view */
+	unsigned int lay = v3d ? v3d->lay:scene->lay; /* fallback to the scene layer, allows duplicate and other oject operators to run outside the 3d view */
 
 	if(CTX_data_dir(member)) {
 		static const char *dir[] = {

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_header.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_header.c	2010-10-19 00:45:37 UTC (rev 32572)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_header.c	2010-10-19 01:21:22 UTC (rev 32573)
@@ -511,7 +511,7 @@
 	}
  		
 	if(obedit==NULL && v3d->localvd==NULL) {
-		int ob_lay = ob ? ob->lay : 0;
+		unsigned int ob_lay = ob ? ob->lay : 0;
 		
 		/* Layers */
 		if (v3d->scenelock)

Modified: trunk/blender/source/blender/makesdna/DNA_armature_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_armature_types.h	2010-10-19 00:45:37 UTC (rev 32572)
+++ trunk/blender/source/blender/makesdna/DNA_armature_types.h	2010-10-19 01:21:22 UTC (rev 32573)
@@ -91,7 +91,7 @@
 	
 	int			pad;
 	
-	int			layer, layer_protected;		/* for buttons to work, both variables in this order together */
+	unsigned int layer, layer_protected;		/* for buttons to work, both variables in this order together */
 	
 // XXX depreceated... old animaton system (armature only viz) ---
 	short		ghostep, ghostsize;		/* number of frames to ghosts to show, and step between them  */

Modified: trunk/blender/source/blender/makesdna/DNA_view3d_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_view3d_types.h	2010-10-19 00:45:37 UTC (rev 32572)
+++ trunk/blender/source/blender/makesdna/DNA_view3d_types.h	2010-10-19 01:21:22 UTC (rev 32573)
@@ -153,7 +153,8 @@
 	
 	char ob_centre_bone[32];		/* optional string for armature bone to define center */
 	
-	int lay, layact;
+	unsigned int lay;
+	int layact;
 	
 	/**
 	 * The drawing mode for the 3d display. Set to OB_WIRE, OB_SOLID,