diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-03-03 13:59:20 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-03-03 14:02:31 +0300 |
| commit | 8c113a95e3536dfa0be37c9e2e924ea8172bb613 (patch) | |
| tree | fc71fffa34bc552168f79efccd5bd02b14700556 /source/blender/makesrna/intern/rna_texture_api.c | |
| parent | ba7eb0c7b9d93987173780d5b819c7f2ec79b96e (diff) | |
Make texture node threaded
Quite trivial idea -- just pass tread ID to the texture sampling function.
Implemented as a TLS to avoid passing huge amount of extra contexts around.
Should be working on all platforms, but compilation test is required.
Reviewers: juicyfruit, campbellbarton
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D1831
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 a27ba6ea06d..ef1ef5e1469 100644 --- a/source/blender/makesrna/intern/rna_texture_api.c +++ b/source/blender/makesrna/intern/rna_texture_api.c @@ -74,7 +74,7 @@ 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}; /* TODO(sergey): always use color management now. */ - multitex_ext(tex, value, NULL, NULL, 1, &texres, NULL, true, false); + multitex_ext(tex, value, NULL, NULL, 1, &texres, 0, NULL, true, false); r_color[0] = texres.tr; r_color[1] = texres.tg; |