[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50989] trunk/blender/source/blender: quiet some warnings.

Campbell Barton ideasman42 at gmail.com
Mon Oct 1 17:27:50 CEST 2012


Revision: 50989
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50989
Author:   campbellbarton
Date:     2012-10-01 15:27:50 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
quiet some warnings.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_layout.c
    trunk/blender/source/blender/editors/space_node/node_ops.c
    trunk/blender/source/blender/editors/util/numinput.c
    trunk/blender/source/blender/opencl/intern/OCL_opencl.c

Modified: trunk/blender/source/blender/editors/interface/interface_layout.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_layout.c	2012-10-01 15:26:48 UTC (rev 50988)
+++ trunk/blender/source/blender/editors/interface/interface_layout.c	2012-10-01 15:27:50 UTC (rev 50989)
@@ -2870,12 +2870,12 @@
 
 		WM_operator_properties_create(&op_ptr, "WM_OT_operator_preset_add");
 		RNA_string_set(&op_ptr, "operator", op->type->idname);
-		op_ptr = uiItemFullO(row, "WM_OT_operator_preset_add", "", ICON_ZOOMIN, op_ptr.data, WM_OP_INVOKE_DEFAULT, 0);
+		uiItemFullO(row, "WM_OT_operator_preset_add", "", ICON_ZOOMIN, op_ptr.data, WM_OP_INVOKE_DEFAULT, 0);
 
 		WM_operator_properties_create(&op_ptr, "WM_OT_operator_preset_add");
 		RNA_string_set(&op_ptr, "operator", op->type->idname);
 		RNA_boolean_set(&op_ptr, "remove_active", TRUE);
-		op_ptr = uiItemFullO(row, "WM_OT_operator_preset_add", "", ICON_ZOOMOUT, op_ptr.data, WM_OP_INVOKE_DEFAULT, 0);
+		uiItemFullO(row, "WM_OT_operator_preset_add", "", ICON_ZOOMOUT, op_ptr.data, WM_OP_INVOKE_DEFAULT, 0);
 	}
 
 	if (op->type->ui) {

Modified: trunk/blender/source/blender/editors/space_node/node_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_ops.c	2012-10-01 15:26:48 UTC (rev 50988)
+++ trunk/blender/source/blender/editors/space_node/node_ops.c	2012-10-01 15:27:50 UTC (rev 50989)
@@ -167,7 +167,7 @@
 	ot = WM_operatortype_append_macro("NODE_OT_move_detach_links_release", "Detach", "Move a node to detach links",
 	                                  OPTYPE_UNDO | OPTYPE_REGISTER);
 	WM_operatortype_macro_define(ot, "NODE_OT_links_detach");
-	mot = WM_operatortype_macro_define(ot, "NODE_OT_translate_attach");
+	WM_operatortype_macro_define(ot, "NODE_OT_translate_attach");
 }
 
 /* helper function for repetitive select operator keymap */

Modified: trunk/blender/source/blender/editors/util/numinput.c
===================================================================
--- trunk/blender/source/blender/editors/util/numinput.c	2012-10-01 15:26:48 UTC (rev 50988)
+++ trunk/blender/source/blender/editors/util/numinput.c	2012-10-01 15:27:50 UTC (rev 50989)
@@ -279,7 +279,9 @@
 				if (!n->ctrl[idx])
 					n->ctrl[idx] = 1;
 
-				if (fabsf(n->val[idx]) > 9999999.0f) ;
+				if (fabsf(n->val[idx]) > 9999999.0f) {
+					/* pass */
+				}
 				else if (n->ctrl[idx] == 1) {
 					n->val[idx] *= 10;
 					n->val[idx] += Val;

Modified: trunk/blender/source/blender/opencl/intern/OCL_opencl.c
===================================================================
--- trunk/blender/source/blender/opencl/intern/OCL_opencl.c	2012-10-01 15:26:48 UTC (rev 50988)
+++ trunk/blender/source/blender/opencl/intern/OCL_opencl.c	2012-10-01 15:27:50 UTC (rev 50989)
@@ -22,14 +22,14 @@
 
 #include "OCL_opencl.h"
 
-void OCL_init()
+void OCL_init(void)
 {
 #ifdef _WIN32
-    const char *path = "OpenCL.dll";
+	const char *path = "OpenCL.dll";
 #elif defined(__APPLE__)
-    const char *path = "/Library/Frameworks/OpenCL.framework/OpenCL";
+	const char *path = "/Library/Frameworks/OpenCL.framework/OpenCL";
 #else
-    const char *path = "libOpenCL.so";
+	const char *path = "libOpenCL.so";
 #endif
 
 	clewInit(path);




More information about the Bf-blender-cvs mailing list