quiet some warnings.
authorCampbell Barton <ideasman42@gmail.com>
Mon, 1 Oct 2012 15:27:50 +0000 (15:27 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 1 Oct 2012 15:27:50 +0000 (15:27 +0000)
source/blender/editors/interface/interface_layout.c
source/blender/editors/space_node/node_ops.c
source/blender/editors/util/numinput.c
source/blender/opencl/intern/OCL_opencl.c

index 8ffbcd6d399c022c9786caf45a4661eca2ff88d6..7a369019ac46615e0301a526eeaef729f1e0e385 100644 (file)
@@ -2870,12 +2870,12 @@ void uiLayoutOperatorButs(const bContext *C, uiLayout *layout, wmOperator *op,
 
                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) {
index a5032fb646593566aaa77c3ab1f3c623dd0bc0ac..560ef9e8a29885f1bec4c95f70249b6977652d51 100644 (file)
@@ -167,7 +167,7 @@ void ED_operatormacros_node(void)
        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 */
index 281b682465d4fd663647902461ace164ca047379..b73f5fa086944311fa9057a668c0ed0d3b177478 100644 (file)
@@ -279,7 +279,9 @@ char handleNumInput(NumInput *n, wmEvent *event)
                                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;
index fa22acbc1a2ba5529c0a4a3b1a4e6d8d9d0d953c..e3130e16bde7aae3ff833acf4c95a86f460f8083 100644 (file)
 
 #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);