[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57431] trunk/blender/source/blender: code cleanup: also fix crash in GPU_state_print().

[Campbell Barton]

Revision: 57431
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57431
Author:   campbellbarton
Date:     2013-06-13 11:59:28 +0000 (Thu, 13 Jun 2013)
Log Message:
-----------
code cleanup: also fix crash in GPU_state_print(). and confine to debug mode builds.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
    trunk/blender/source/blender/bmesh/intern/bmesh_interp.c
    trunk/blender/source/blender/collada/TransformWriter.cpp
    trunk/blender/source/blender/collada/collada_utils.cpp
    trunk/blender/source/blender/editors/transform/transform_generics.c
    trunk/blender/source/blender/gpu/intern/gpu_draw.c
    trunk/blender/source/blender/gpu/intern/gpu_extensions.c

Modified: trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2013-06-13 11:49:22 UTC (rev 57430)
+++ trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2013-06-13 11:59:28 UTC (rev 57431)
@@ -747,7 +747,7 @@
 #endif
 
 	if (c->frame_size == 0)
-		// used to be if((c->codec_id >= CODEC_ID_PCM_S16LE) && (c->codec_id <= CODEC_ID_PCM_DVD))
+		// used to be if ((c->codec_id >= CODEC_ID_PCM_S16LE) && (c->codec_id <= CODEC_ID_PCM_DVD))
 		// not sure if that is needed anymore, so let's try out if there are any
 		// complaints regarding some ffmpeg versions users might have
 		audio_input_samples = FF_MIN_BUFFER_SIZE * 8 / c->bits_per_coded_sample / c->channels;

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_interp.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_interp.c	2013-06-13 11:49:22 UTC (rev 57430)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_interp.c	2013-06-13 11:59:28 UTC (rev 57431)
@@ -465,7 +465,7 @@
 
 	res = (int)sqrt(mdisps->totdisp);
 	d = 1.0f / (float)(res - 1);
-	#pragma omp parallel for if(res > 3)
+#pragma omp parallel for if (res > 3)
 	for (ix = 0; ix < res; ix++) {
 		float x = d * ix, y;
 		int iy;

Modified: trunk/blender/source/blender/collada/TransformWriter.cpp
===================================================================
--- trunk/blender/source/blender/collada/TransformWriter.cpp	2013-06-13 11:49:22 UTC (rev 57430)
+++ trunk/blender/source/blender/collada/TransformWriter.cpp	2013-06-13 11:59:28 UTC (rev 57431)
@@ -103,7 +103,7 @@
 	if (ob->parent) {
 		// If parentinv is identity don't add it.
 		bool add_parinv = false;
-    		
+
 		for (int i = 0; i < 16; ++i) {
 			float f = (i % 4 == i / 4) ? 1.0f : 0.0f;
 			add_parinv |= (ob->parentinv[i % 4][i / 4] != f);

Modified: trunk/blender/source/blender/collada/collada_utils.cpp
===================================================================
--- trunk/blender/source/blender/collada/collada_utils.cpp	2013-06-13 11:49:22 UTC (rev 57430)
+++ trunk/blender/source/blender/collada/collada_utils.cpp	2013-06-13 11:59:28 UTC (rev 57431)
@@ -311,7 +311,7 @@
                               const std::string& replacement)
 {
 	size_t pos = 0;
-	while((pos = data.find(pattern, pos)) != std::string::npos) {
+	while ((pos = data.find(pattern, pos)) != std::string::npos) {
 		data.replace(pos, pattern.length(), replacement);
 		pos += replacement.length();
 	}

Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_generics.c	2013-06-13 11:49:22 UTC (rev 57430)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c	2013-06-13 11:59:28 UTC (rev 57431)
@@ -909,7 +909,7 @@
 			 */
 			DAG_id_tag_update(&ob->id, OB_RECALC_OB);
 
-			if(t->flag & T_TEXTURE)
+			if (t->flag & T_TEXTURE)
 				DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		}
 	}

Modified: trunk/blender/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_draw.c	2013-06-13 11:49:22 UTC (rev 57430)
+++ trunk/blender/source/blender/gpu/intern/gpu_draw.c	2013-06-13 11:59:28 UTC (rev 57431)
@@ -1794,17 +1794,18 @@
 	// glDisable(GL_MULTISAMPLE);
 }
 
+#ifdef DEBUG
 /* debugging aid */
 static void gpu_get_print(const char *name, GLenum type)
 {
-	float value[16];
+	float value[32];
 	int a;
 	
 	memset(value, 0, sizeof(value));
 	glGetFloatv(type, value);
 
 	printf("%s: ", name);
-	for (a=0; a<16; a++)
+	for (a = 0; a < 32; a++)
 		printf("%.2f ", value[a]);
 	printf("\n");
 }
@@ -2156,4 +2157,4 @@
 	gpu_get_print("GL_ZOOM_X", GL_ZOOM_X);
 	gpu_get_print("GL_ZOOM_Y", GL_ZOOM_Y);
 }
-
+#endif

Modified: trunk/blender/source/blender/gpu/intern/gpu_extensions.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_extensions.c	2013-06-13 11:49:22 UTC (rev 57430)
+++ trunk/blender/source/blender/gpu/intern/gpu_extensions.c	2013-06-13 11:59:28 UTC (rev 57431)
@@ -1159,9 +1159,9 @@
 	/* some useful defines to detect GPU type */
 	if (GPU_type_matches(GPU_DEVICE_ATI, GPU_OS_ANY, GPU_DRIVER_ANY))
 		return "#define GPU_ATI\n";
-	else if(GPU_type_matches(GPU_DEVICE_NVIDIA, GPU_OS_ANY, GPU_DRIVER_ANY))
+	else if (GPU_type_matches(GPU_DEVICE_NVIDIA, GPU_OS_ANY, GPU_DRIVER_ANY))
 		return "#define GPU_NVIDIA\n";
-	else if(GPU_type_matches(GPU_DEVICE_INTEL, GPU_OS_ANY, GPU_DRIVER_ANY))
+	else if (GPU_type_matches(GPU_DEVICE_INTEL, GPU_OS_ANY, GPU_DRIVER_ANY))
 		return "#define GPU_INTEL\n";
 	
 	return "";