bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

svn merge ^/trunk/blender -r55813:55815

Browse Source
This commit is contained in:
Campbell Barton 2013-04-05 16:27:39 +00:00
commit 01a87fe1b9
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/brush.c
View File

@ -541,9 +541,9 @@ float BKE_brush_sample_tex_3D(const Scene *scene, Brush *br,
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]);

3
source/blender/compositor/nodes/COM_ZCombineNode.cpp
View File

@ -67,7 +67,8 @@ void ZCombineNode::convertToOperations(ExecutionSystem *system, CompositorContex
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();

3
source/blender/compositor/operations/COM_MixHueOperation.cpp
View File

@ -56,7 +56,8 @@ void MixHueOperation::executePixel(float output[4], float x, float y, PixelSampl
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];

3
source/blender/compositor/operations/COM_MixSaturationOperation.cpp
View File

@ -52,7 +52,8 @@ void MixSaturationOperation::executePixel(float output[4], float x, float y, Pix
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);
}

6
source/blender/windowmanager/intern/wm_keymap.c
View File

@ -964,10 +964,12 @@ static wmKeyMapItem *wm_keymap_item_find(
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);
}