diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-08-19 13:05:34 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-08-19 13:05:34 +0400 |
| commit | beffaa293ee2b111f256b989bd038460bde1eea0 (patch) | |
| tree | 9dbb83497da3cc5ed65d902666d094729c50f21e /source/creator | |
| parent | a14febc70a0f8cb1ec8082600104a6629b0a20ee (diff) | |
Made modifiers_getVirtualModifierList safe for threading
Move static variables to context filling in by this fcuntion
and owned by a callee function. This ensures no conflicts
between threads happens because of static variables used in
this function.
Also moved modifier types and virtual modifiers data to a
function called from creator. This is needed to be sure all
the information is properly initialied to the time when
threads starts to use this data.
--
svn merge -r57899:57900 ^/branches/soc-2013-depsgraph_mt
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/creator.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/creator/creator.c b/source/creator/creator.c index a710c07f34b..27fd9427da7 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -92,6 +92,7 @@ #include "BKE_library.h" #include "BKE_main.h" #include "BKE_material.h" +#include "BKE_modifier.h" #include "BKE_packedFile.h" #include "BKE_scene.h" #include "BKE_node.h" @@ -1517,6 +1518,7 @@ int main(int argc, const char **argv) IMB_init(); BKE_images_init(); + BKE_modifier_init(); BKE_brush_system_init(); |