[Bf-blender-cvs] [d3309ac] master: Code cleanup: correct arg size

Campbell Barton noreply at git.blender.org
Fri Mar 28 22:43:57 CET 2014


Commit: d3309ac5c9be791dbc45aafc8a79c94e184b406a
Author: Campbell Barton
Date:   Sat Mar 29 08:42:11 2014 +1100
https://developer.blender.org/rBd3309ac5c9be791dbc45aafc8a79c94e184b406a

Code cleanup: correct arg size

===================================================================

M	source/blender/blenkernel/BKE_brush.h
M	source/blender/blenkernel/intern/brush.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h
index b4c5f47..104e80e 100644
--- a/source/blender/blenkernel/BKE_brush.h
+++ b/source/blender/blenkernel/BKE_brush.h
@@ -72,7 +72,7 @@ float BKE_brush_curve_strength(struct Brush *br, float p, const float len); /* u
 /* sampling */
 float BKE_brush_sample_tex_3D(const Scene *scene, struct Brush *br, const float point[3],
                               float rgba[4], const int thread, struct ImagePool *pool);
-float BKE_brush_sample_masktex(const Scene *scene, struct Brush *br, const float point[3],
+float BKE_brush_sample_masktex(const Scene *scene, struct Brush *br, const float point[2],
                                const int thread, struct ImagePool *pool);
 
 /* texture */
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index 5ef7094..17fdb15 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -649,7 +649,7 @@ float BKE_brush_sample_tex_3D(const Scene *scene, Brush *br,
 }
 
 float BKE_brush_sample_masktex(const Scene *scene, Brush *br,
-                               const float point[3],
+                               const float point[2],
                                const int thread,
                                struct ImagePool *pool)
 {




More information about the Bf-blender-cvs mailing list