Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-06-02 19:02:17 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-06-02 19:02:17 +0400
commit732c566f2fb5253c152b81ebbe76eb6a17862046 (patch)
treef63858393ec3b8f16dd7d9fcf2cfc251eaaf396b /SConstruct
parent0fa08424b7a78bbf3fd6eb142d477feb0cca9806 (diff)
Fix #35587: Cycles: image movie to single image crashing
Crash was happening on windows platforms only and was caused by some specifics about how CRT works. Basically, blender and all of the .dll are compiled with /MT flag, which means blender.exe and all .dll are using separate environments. This makes it impossible to pass file descriptors from blender to other dll, because it becomes invalid in the dll. And this is exactly what was happening: OIIO was trying to open movie file with all known plugins and one of them was zlib. And the way OIIO was using zlib API is opening the file using Boost and passing a file descriptor to zlib. And since zlib was a dynamic library this lead to general issues using this descriptor in zlib code. Solved by linking to zlib statically. This allows to safely pass file descriptor to zlib API. Alternative would be to compile all the stuff with /MD flag, but that's much bigger and less robust way to fix the issue. Tested on windows using msvc2008, scons plus cmake both 32 and 64 bit versions. Seems to be working fine. Further tweaks for mingw and msvc2012 could be needed tho.
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct1
1 files changed, 0 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index 03cfe3ed4ca..c0c505fcc23 100644
--- a/SConstruct
+++ b/SConstruct
@@ -910,7 +910,6 @@ else:
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
dllsources = []
- dllsources += ['${BF_ZLIB_LIBPATH}/zlib.dll']
# Used when linking to libtiff was dynamic
# keep it here until compilation on all platform would be ok
# dllsources += ['${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll']