diff options
author | Ton Roosendaal <ton@blender.org> | 2006-01-03 23:06:08 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-01-03 23:06:08 +0300 |
commit | 750b9df26a3cdf8eab543c603164b57336e5bd1d (patch) | |
tree | 0f31ae66db227f84dfcc01e6ec06a53affdbfaae /source/blender/render | |
parent | a085a41bc515f5ee0000ba919c01e4fca512ac56 (diff) |
Bugfix #3673
Threadsafe patch for environment maps type "Load" missed to include a
call, so still crashed. Only for non-debug builds though, so not reported
earlier.
From my cvs log 7 months ago:
"Added threadsafe patch from Martin.
Now envmaps of type "Load" should not give errors. I assume Martin tested!"
:)
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/envmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/envmap.c b/source/blender/render/intern/source/envmap.c index f3d8ef94d8e..e38d7e0d740 100644 --- a/source/blender/render/intern/source/envmap.c +++ b/source/blender/render/intern/source/envmap.c @@ -657,8 +657,8 @@ int envmaptex(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, TexRe // Now thread safe if(load_ibuf_lock) SDL_mutexP(load_ibuf_lock); if(env->ima->ibuf==NULL) ima_ibuf_is_nul(tex, tex->ima); - if(load_ibuf_lock) SDL_mutexV(load_ibuf_lock); if(env->ima->ok && env->ok==0) envmap_split_ima(env); + if(load_ibuf_lock) SDL_mutexV(load_ibuf_lock); } } |