[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57942] branches/soc-2013-depsgraph_mt/ source/blender/blenkernel/intern/displist.c: Initial idea of running post-modifiers out of lock wasn't correct
Sergey Sharybin
sergey.vfx at gmail.com
Tue Jul 2 21:23:06 CEST 2013
Revision: 57942
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57942
Author: nazgul
Date: 2013-07-02 19:23:06 +0000 (Tue, 02 Jul 2013)
Log Message:
-----------
Initial idea of running post-modifiers out of lock wasn't correct
The tihng here is: curve is getting modified by modifier stack
and then it's coordinates are restored. To be really safe we
need to do all this locked.
Modified Paths:
--------------
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/displist.c
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/displist.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/displist.c 2013-07-02 19:23:03 UTC (rev 57941)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/displist.c 2013-07-02 19:23:06 UTC (rev 57942)
@@ -1599,9 +1599,6 @@
cu->bb = MEM_callocN(sizeof(BoundBox), "boundbox");
}
- /* XXX: Temp workaround for depsgraph_mt branch. */
- BLI_unlock_thread(LOCK_CUSTOM1);
-
boundbox_dispbase(cu->bb, dispbase);
if (!forRender) {
@@ -1611,6 +1608,9 @@
if (!forOrco)
curve_calc_modifiers_post(scene, ob, dispbase, derivedFinal, forRender, renderResolution, originalVerts, deformedVerts);
+ /* XXX: Temp workaround for depsgraph_mt branch. */
+ BLI_unlock_thread(LOCK_CUSTOM1);
+
if (cu->flag & CU_DEFORM_FILL && !ob->derivedFinal) {
curve_to_filledpoly(cu, nubase, dispbase);
}
More information about the Bf-blender-cvs
mailing list