[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55815] trunk/blender/source/blender: code cleanup: quiet some warnings and style
Campbell Barton
ideasman42 at gmail.com
Fri Apr 5 17:45:10 CEST 2013
Revision: 55815
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55815
Author: campbellbarton
Date: 2013-04-05 15:45:10 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
code cleanup: quiet some warnings and style
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/brush.c
trunk/blender/source/blender/compositor/nodes/COM_ZCombineNode.cpp
trunk/blender/source/blender/compositor/operations/COM_MixHueOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
Modified: trunk/blender/source/blender/blenkernel/intern/brush.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/brush.c 2013-04-05 15:42:31 UTC (rev 55814)
+++ trunk/blender/source/blender/blenkernel/intern/brush.c 2013-04-05 15:45:10 UTC (rev 55815)
@@ -541,9 +541,9 @@
y = flen * sinf(angle);
}
- if (fabs(x) > br->stencil_dimension[0] || fabs(y) > br->stencil_dimension[1]) {
- rgba[0] = rgba[1] = rgba[2] = rgba[3] = 0.0;
- return 0.0;
+ if (fabsf(x) > br->stencil_dimension[0] || fabsf(y) > br->stencil_dimension[1]) {
+ zero_v4(rgba);
+ return 0.0f;
}
x /= (br->stencil_dimension[0]);
y /= (br->stencil_dimension[1]);
Modified: trunk/blender/source/blender/compositor/nodes/COM_ZCombineNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_ZCombineNode.cpp 2013-04-05 15:42:31 UTC (rev 55814)
+++ trunk/blender/source/blender/compositor/nodes/COM_ZCombineNode.cpp 2013-04-05 15:45:10 UTC (rev 55815)
@@ -67,7 +67,8 @@
system->addOperation(zoperation);
}
}
- } else {
+ }
+ else {
// not full anti alias, use masking for Z combine. be aware it uses anti aliasing.
// step 1 create mask
MathGreaterThanOperation *maskoperation = new MathGreaterThanOperation();
Modified: trunk/blender/source/blender/compositor/operations/COM_MixHueOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_MixHueOperation.cpp 2013-04-05 15:42:31 UTC (rev 55814)
+++ trunk/blender/source/blender/compositor/operations/COM_MixHueOperation.cpp 2013-04-05 15:45:10 UTC (rev 55815)
@@ -56,7 +56,8 @@
output[0] = valuem * (inputColor1[0]) + value * tmpr;
output[1] = valuem * (inputColor1[1]) + value * tmpg;
output[2] = valuem * (inputColor1[2]) + value * tmpb;
- } else {
+ }
+ else {
copy_v3_v3(output, inputColor1);
}
output[3] = inputColor1[3];
Modified: trunk/blender/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_MixSaturationOperation.cpp 2013-04-05 15:42:31 UTC (rev 55814)
+++ trunk/blender/source/blender/compositor/operations/COM_MixSaturationOperation.cpp 2013-04-05 15:45:10 UTC (rev 55815)
@@ -52,7 +52,8 @@
float colH, colS, colV;
rgb_to_hsv(inputColor2[0], inputColor2[1], inputColor2[2], &colH, &colS, &colV);
hsv_to_rgb(rH, (valuem * rS + value * colS), rV, &output[0], &output[1], &output[2]);
- } else {
+ }
+ else {
copy_v3_v3(output, inputColor1);
}
Modified: trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_keymap.c 2013-04-05 15:42:31 UTC (rev 55814)
+++ trunk/blender/source/blender/windowmanager/intern/wm_keymap.c 2013-04-05 15:45:10 UTC (rev 55815)
@@ -964,10 +964,12 @@
RNA_pointer_create(NULL, ot->srna, properties_default, &opptr);
if (WM_operator_properties_default(&opptr, true) ||
- (ot->prop && RNA_property_is_set(&opptr, ot->prop))) {
+ (ot->prop && RNA_property_is_set(&opptr, ot->prop)))
+ {
/* for operator that has enum menu, unset it so it always matches */
- if (ot->prop)
+ if (ot->prop) {
RNA_property_unset(&opptr, ot->prop);
+ }
found = wm_keymap_item_find_props(C, opname, opcontext, properties_default, 0, hotkey, keymap_r);
}
More information about the Bf-blender-cvs
mailing list