diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-10-01 19:27:50 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-01 19:27:50 +0400 |
commit | 4eb8bceaf82ea30782d7383ed94a0cb6f1b0e257 (patch) | |
tree | 78fabd453bc6b315aee3cc1ee2fca2a783332f88 /source | |
parent | 7d1da8b60a5c404a263267477707455bcb7f3c3f (diff) |
quiet some warnings.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/interface/interface_layout.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_ops.c | 2 | ||||
-rw-r--r-- | source/blender/editors/util/numinput.c | 4 | ||||
-rw-r--r-- | source/blender/opencl/intern/OCL_opencl.c | 8 |
4 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 8ffbcd6d399..7a369019ac4 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -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) { diff --git a/source/blender/editors/space_node/node_ops.c b/source/blender/editors/space_node/node_ops.c index a5032fb6465..560ef9e8a29 100644 --- a/source/blender/editors/space_node/node_ops.c +++ b/source/blender/editors/space_node/node_ops.c @@ -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 */ diff --git a/source/blender/editors/util/numinput.c b/source/blender/editors/util/numinput.c index 281b682465d..b73f5fa0869 100644 --- a/source/blender/editors/util/numinput.c +++ b/source/blender/editors/util/numinput.c @@ -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; diff --git a/source/blender/opencl/intern/OCL_opencl.c b/source/blender/opencl/intern/OCL_opencl.c index fa22acbc1a2..e3130e16bde 100644 --- a/source/blender/opencl/intern/OCL_opencl.c +++ b/source/blender/opencl/intern/OCL_opencl.c @@ -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); |