diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-16 10:47:01 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-16 10:47:01 +0400 |
| commit | 0abe1911d57b4d4a806a5de6f8cdf4f421abb7cf (patch) | |
| tree | 984a52b0b297130fd01c8c7179fbabfc419a8782 /source/blender/makesrna/intern/rna_texture_api.c | |
| parent | 862aababb300fc366628a302931c38a6201262db (diff) | |
- fix for access past the buffer size (paint / sculpt used some 2d vecs as 3d)
- remove redundant NULL checks on old code where it would crash if the result was NULL later on.
- add some missing NULL checks.
Diffstat (limited to 'source/blender/makesrna/intern/rna_texture_api.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_texture_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_texture_api.c b/source/blender/makesrna/intern/rna_texture_api.c index 8c63d5da8fd..4941c75c400 100644 --- a/source/blender/makesrna/intern/rna_texture_api.c +++ b/source/blender/makesrna/intern/rna_texture_api.c @@ -68,7 +68,7 @@ void clear_envmap(struct EnvMap *env, bContext *C) } } -void texture_evaluate(struct Tex *tex, float value[3], float color_r[3]) +void texture_evaluate(struct Tex *tex, float value[3], float color_r[4]) { TexResult texres= {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, NULL}; multitex_ext(tex, value, NULL, NULL, 1, &texres); |