[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60496] trunk/blender/source/blender: style edits and use macro for prefix check

[Campbell Barton]

Revision: 60496
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60496
Author:   campbellbarton
Date:     2013-10-01 16:40:11 +0000 (Tue, 01 Oct 2013)
Log Message:
-----------
style edits and use macro for prefix check

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/anim_sys.c
    trunk/blender/source/blender/blenkernel/intern/texture.c
    trunk/blender/source/blender/editors/screen/screendump.c
    trunk/blender/source/blender/editors/sculpt_paint/sculpt_uv.c

Modified: trunk/blender/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim_sys.c	2013-10-01 16:15:52 UTC (rev 60495)
+++ trunk/blender/source/blender/blenkernel/intern/anim_sys.c	2013-10-01 16:40:11 UTC (rev 60496)
@@ -774,7 +774,7 @@
 		fcn = fcu->next;
 
 		if (fcu->rna_path) {
-			if (strncmp(prefix, fcu->rna_path, strlen(prefix)) == 0) {
+			if (STRPREFIX(fcu->rna_path, prefix)) {
 				BLI_remlink(curves, fcu);
 				free_fcurve(fcu);
 			}

Modified: trunk/blender/source/blender/blenkernel/intern/texture.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/texture.c	2013-10-01 16:15:52 UTC (rev 60495)
+++ trunk/blender/source/blender/blenkernel/intern/texture.c	2013-10-01 16:40:11 UTC (rev 60496)
@@ -124,11 +124,11 @@
 		if (ELEM(texmap->type, TEXMAP_TYPE_TEXTURE, TEXMAP_TYPE_NORMAL)) {
 			/* keep matrix invertible */
 			if (fabsf(size[0]) < 1e-5f)
-				size[0] = signf(size[0])*1e-5f;
+				size[0] = signf(size[0]) * 1e-5f;
 			if (fabsf(size[1]) < 1e-5f)
-				size[1] = signf(size[1])*1e-5f;
+				size[1] = signf(size[1]) * 1e-5f;
 			if (fabsf(size[2]) < 1e-5f)
-				size[2] = signf(size[2])*1e-5f;
+				size[2] = signf(size[2]) * 1e-5f;
 		}
 		
 		size_to_mat4(smat, texmap->size);

Modified: trunk/blender/source/blender/editors/screen/screendump.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screendump.c	2013-10-01 16:15:52 UTC (rev 60495)
+++ trunk/blender/source/blender/editors/screen/screendump.c	2013-10-01 16:40:11 UTC (rev 60496)
@@ -85,7 +85,7 @@
 	glFinish();
 
 	/* clear alpha, it is not set to a meaningful value in opengl */
-	for (i = 0, rect += 3; i < w*h; i++, rect += 4)
+	for (i = 0, rect += 3; i < w * h; i++, rect += 4)
 		*rect = 255;
 }
 
@@ -327,7 +327,7 @@
 	
 	if (sj->dumprect == NULL) {
 		dumprect = MEM_mallocN(sizeof(int) * sj->dumpsx * sj->dumpsy, "dumprect");
-		screenshot_read_pixels(sj->x, sj->y, sj->dumpsx, sj->dumpsy, (unsigned char*)dumprect);
+		screenshot_read_pixels(sj->x, sj->y, sj->dumpsx, sj->dumpsy, (unsigned char *)dumprect);
 		
 		sj->dumprect = dumprect;
 	}

Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt_uv.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt_uv.c	2013-10-01 16:15:52 UTC (rev 60495)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt_uv.c	2013-10-01 16:40:11 UTC (rev 60496)
@@ -539,7 +539,7 @@
 
 	op->customdata = data;
 
-	curvemapping_initialize (ts->uvsculpt->paint.brush->curve);
+	curvemapping_initialize(ts->uvsculpt->paint.brush->curve);
 
 	if (data) {
 		int counter = 0, i;