diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-13 22:10:05 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-13 22:10:05 +0400 |
| commit | 962865d19f4bd8639ac6c2064a3c82e5674e7802 (patch) | |
| tree | 31938e1ccb78f7748f018e6e9be77dc280ca623b /source/blender/blenkernel/intern/brush.c | |
| parent | 5ff0daf1acdc5d88afcec016a379b33cb2cd1288 (diff) | |
fix for 2 errors where the 2d arrays were used as 3d. (out of bounds read).
also minor code cleanup.
Diffstat (limited to 'source/blender/blenkernel/intern/brush.c')
| -rw-r--r-- | source/blender/blenkernel/intern/brush.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 289086f8b86..71db2fc56da 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -532,7 +532,7 @@ float BKE_brush_sample_tex_3D(const Scene *scene, Brush *br, /* Get strength by feeding the vertex * location directly into a texture */ hasrgb = externtex(mtex, point, &intensity, - rgba, rgba + 1, rgba + 2, rgba + 3, 0, pool); + rgba, rgba + 1, rgba + 2, rgba + 3, 0, pool); } else { float rotation = -mtex->rot; @@ -587,7 +587,7 @@ float BKE_brush_sample_tex_3D(const Scene *scene, Brush *br, co[2] = 0.0f; hasrgb = externtex(mtex, co, &intensity, - rgba, rgba + 1, rgba + 2, rgba + 3, 0, pool); + rgba, rgba + 1, rgba + 2, rgba + 3, 0, pool); } intensity += br->texture_sample_bias; |