diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-25 20:33:55 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-25 20:33:55 +0300 |
| commit | bcc020b1bc1b60f6cbd6d2c9bf400744931e57e1 (patch) | |
| tree | fef4d83d0e5addb59c8389adf125281a4c7e35f8 /source/blender/render/intern/source/render_texture.c | |
| parent | 99bb1accbbb8e1ba38f30b073b22deb107bf3220 (diff) | |
| parent | 3f36cd3f33e52d53d82a3a221e2a576cf26390a5 (diff) | |
Merge branch 'asset-engine' into asset-experimentsasset-experiments
Conflicts:
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'source/blender/render/intern/source/render_texture.c')
| -rw-r--r-- | source/blender/render/intern/source/render_texture.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index 513cfa6df7d..b4a14f5337d 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -3653,7 +3653,8 @@ void render_realtime_texture(ShadeInput *shi, Image *ima) if (firsttime) { BLI_lock_thread(LOCK_IMAGE); if (firsttime) { - for (a=0; a<BLENDER_MAX_THREADS; a++) { + const int num_threads = BLI_system_thread_count(); + for (a = 0; a < num_threads; a++) { memset(&imatex[a], 0, sizeof(Tex)); BKE_texture_default(&imatex[a]); imatex[a].type= TEX_IMAGE; |