diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2022-01-28 15:28:31 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2022-01-28 15:28:31 +0300 |
| commit | cdcbdf8ce46d14c753d68ee8dfa533c642376805 (patch) | |
| tree | 8557864b1f75f6a0a2c80df48692a7723c9e0300 /source/blender/makesrna | |
| parent | 7c48196056c88c17c551e3177ef7b6f276f01d77 (diff) | |
Remove compilation warnings TexResult.
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_texture_api.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_texture_api.c b/source/blender/makesrna/intern/rna_texture_api.c index 0920fe6679a..2a4cdaebcee 100644 --- a/source/blender/makesrna/intern/rna_texture_api.c +++ b/source/blender/makesrna/intern/rna_texture_api.c @@ -32,6 +32,7 @@ # include "BKE_context.h" # include "BKE_global.h" +# include "BLI_math.h" # include "DNA_scene_types.h" # include "IMB_imbuf.h" # include "IMB_imbuf_types.h" @@ -40,14 +41,12 @@ static void texture_evaluate(struct Tex *tex, float value[3], float r_color[4]) { - TexResult texres = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, NULL}; + TexResult texres = {0.0f}; /* TODO(sergey): always use color management now. */ multitex_ext(tex, value, NULL, NULL, 1, &texres, 0, NULL, true, false); - r_color[0] = texres.tr; - r_color[1] = texres.tg; - r_color[2] = texres.tb; + copy_v3_v3(r_color, texres.trgba); r_color[3] = texres.tin; } |