diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-13 06:24:41 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-13 06:25:36 +0300 |
| commit | 184ab749c38a6e90744022a030bec6a6ee584a0a (patch) | |
| tree | c7ed0a96e402dbbd7225447ec3249dce4c1a322b /source/blender/blenkernel/intern/brush.c | |
| parent | 97062a1b9b2c89a9372b5870418684551b111bab (diff) | |
| parent | fe566a30f3c7ae835c1f2750fb773073b8e40622 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/brush.c')
| -rw-r--r-- | source/blender/blenkernel/intern/brush.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 62c72a4fa58..39266eed6fe 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -845,7 +845,7 @@ void BKE_brush_curve_preset(Brush *b, eCurveMappingPreset preset) * region space mouse coordinates, or 3d world coordinates for 3D mapping. * * rgba outputs straight alpha. */ -float BKE_brush_sample_tex_3D(const Scene *scene, const Brush *br, +float BKE_brush_sample_tex_3d(const Scene *scene, const Brush *br, const float point[3], float rgba[4], const int thread, struct ImagePool *pool) |