[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55816] branches/soc-2008-mxcurioni: svn merge ^/trunk/blender -r55813:55815
Campbell Barton
ideasman42 at gmail.com
Fri Apr 5 18:27:39 CEST 2013
Revision: 55816
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55816
Author: campbellbarton
Date: 2013-04-05 16:27:39 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
svn merge ^/trunk/blender -r55813:55815
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55813
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ZCombineNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixHueOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_keymap.c
Property Changed:
----------------
branches/soc-2008-mxcurioni/
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-55813
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-55815
Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c 2013-04-05 15:45:10 UTC (rev 55815)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c 2013-04-05 16:27:39 UTC (rev 55816)
@@ -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: branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ZCombineNode.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ZCombineNode.cpp 2013-04-05 15:45:10 UTC (rev 55815)
+++ branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ZCombineNode.cpp 2013-04-05 16:27:39 UTC (rev 55816)
@@ -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: branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixHueOperation.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixHueOperation.cpp 2013-04-05 15:45:10 UTC (rev 55815)
+++ branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixHueOperation.cpp 2013-04-05 16:27:39 UTC (rev 55816)
@@ -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: branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixSaturationOperation.cpp 2013-04-05 15:45:10 UTC (rev 55815)
+++ branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixSaturationOperation.cpp 2013-04-05 16:27:39 UTC (rev 55816)
@@ -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: branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_keymap.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_keymap.c 2013-04-05 15:45:10 UTC (rev 55815)
+++ branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_keymap.c 2013-04-05 16:27:39 UTC (rev 55816)
@@ -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