[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32534] trunk/blender/source: fix for bad use of UNUSED() with win32 & some other minor error checks.

[Campbell Barton]

Revision: 32534
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32534
Author:   campbellbarton
Date:     2010-10-17 10:59:23 +0200 (Sun, 17 Oct 2010)

Log Message:
-----------
fix for bad use of UNUSED() with win32 & some other minor error checks.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_widgets.c
    trunk/blender/source/blender/render/intern/source/texture.c
    trunk/blender/source/creator/creator.c

Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c	2010-10-17 08:04:28 UTC (rev 32533)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c	2010-10-17 08:59:23 UTC (rev 32534)
@@ -27,6 +27,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
+#include <assert.h>
 
 
 #include "DNA_screen_types.h"
@@ -1773,6 +1774,12 @@
 			VECCOPY(col1[1], col1[2]);
 			VECCOPY(col1[3], col1[2]);
 			break;
+		default:
+			assert(!"invalid 'type' argument");
+			hsv_to_rgb(1.0, 1.0, 1.0,   &col1[2][0], &col1[2][1], &col1[2][2]);
+			VECCOPY(col1[0], col1[2]);
+			VECCOPY(col1[1], col1[2]);
+			VECCOPY(col1[3], col1[2]);			
 	}
 	
 	/* old below */

Modified: trunk/blender/source/blender/render/intern/source/texture.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/texture.c	2010-10-17 08:04:28 UTC (rev 32533)
+++ trunk/blender/source/blender/render/intern/source/texture.c	2010-10-17 08:59:23 UTC (rev 32534)
@@ -771,7 +771,7 @@
 		if (pit->version < 6) {
 			texres->tin = pit->result[0];
 		} else {
-			texres->tin = result[0];
+			texres->tin = result[0]; /* XXX, assigning garbage value, fixme! */
 		}
 
 		if(rgbnor & TEX_NOR) {

Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c	2010-10-17 08:04:28 UTC (rev 32533)
+++ trunk/blender/source/creator/creator.c	2010-10-17 08:59:23 UTC (rev 32534)
@@ -422,11 +422,13 @@
 	return 0;
 }
 
-static int register_extension(int UNUSED(argc), char **UNUSED(argv), void *UNUSED(data))
+static int register_extension(int UNUSED(argc), char **UNUSED(argv), void *data)
 {
 #ifdef WIN32
 	char *path = BLI_argsArgv(data)[0];
 	RegisterBlendExtension(path);
+#else
+	(void)data; /* unused */
 #endif
 
 	return 0;