diff options
5 files changed, 13 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 3fbbbc84ef4..e140bd1a68a 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -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]); diff --git a/source/blender/compositor/nodes/COM_ZCombineNode.cpp b/source/blender/compositor/nodes/COM_ZCombineNode.cpp index 35eedf435f6..82effaf0eda 100644 --- a/source/blender/compositor/nodes/COM_ZCombineNode.cpp +++ b/source/blender/compositor/nodes/COM_ZCombineNode.cpp @@ -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(); diff --git a/source/blender/compositor/operations/COM_MixHueOperation.cpp b/source/blender/compositor/operations/COM_MixHueOperation.cpp index 1fa393bb362..8f898cf8ecf 100644 --- a/source/blender/compositor/operations/COM_MixHueOperation.cpp +++ b/source/blender/compositor/operations/COM_MixHueOperation.cpp @@ -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]; diff --git a/source/blender/compositor/operations/COM_MixSaturationOperation.cpp b/source/blender/compositor/operations/COM_MixSaturationOperation.cpp index 69207d7fbaa..3ab19748458 100644 --- a/source/blender/compositor/operations/COM_MixSaturationOperation.cpp +++ b/source/blender/compositor/operations/COM_MixSaturationOperation.cpp @@ -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); } diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index aa9af4af154..f06bae1d084 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -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); } |