diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-04-05 20:27:39 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-05 20:27:39 +0400 |
commit | 01a87fe1b936d2bce0d7a16bfdf7aabe443d1d0b (patch) | |
tree | af742bf6cdc4cdb9405adbc0c7ad0b119fdded4a /source/blender/blenkernel/intern | |
parent | 89926a0598a794043ed9b702f32d119fed888c04 (diff) | |
parent | cf76d73b8386242d7f655974837d7843c774b36c (diff) |
svn merge ^/trunk/blender -r55813:55815
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/brush.c | 6 |
1 files changed, 3 insertions, 3 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]); |