[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58157] trunk/blender/source/blender: Fix #36082: animation playback not working after rendering of background scenes and

[Brecht Van Lommel]

Revision: 58157
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58157
Author:   blendix
Date:     2013-07-10 16:46:13 +0000 (Wed, 10 Jul 2013)
Log Message:
-----------
Fix #36082: animation playback not working after rendering of background scenes and
multiple render layer nodes. Also fixes issue with database free with vector blur
after recent thread safety changes.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/scene.c
    trunk/blender/source/blender/render/intern/source/convertblender.c

Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c	2013-07-10 14:30:25 UTC (rev 58156)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c	2013-07-10 16:46:13 UTC (rev 58157)
@@ -684,12 +684,9 @@
 		}
 	}
 
-	/* sort baselist */
-	DAG_scene_relations_rebuild(bmain, scene);
-	
-	/* ensure dags are built for sets */
+	/* sort baselist for scene and sets */
 	for (sce = scene; sce; sce = sce->set)
-		DAG_scene_relations_update(bmain, sce);
+		DAG_scene_relations_rebuild(bmain, sce);
 
 	/* copy layers and flags from bases to objects */
 	for (base = scene->base.first; base; base = base->next) {

Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c	2013-07-10 14:30:25 UTC (rev 58156)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c	2013-07-10 16:46:13 UTC (rev 58157)
@@ -5403,12 +5403,10 @@
 				volume_precache(re);
 	}
 	
-	if (re->test_break(re->tbh)) {
-		re->i.convertdone = TRUE;
+	re->i.convertdone = TRUE;
+
+	if (re->test_break(re->tbh))
 		RE_Database_Free(re);
-	}
-	else
-		re->i.convertdone = TRUE;
 	
 	re->i.infostr = NULL;
 	re->stats_draw(re->sdh, &re->i);
@@ -5858,6 +5856,7 @@
 	/* free dbase and make the future one */
 	strandsurface= re->strandsurface;
 	memset(&re->strandsurface, 0, sizeof(ListBase));
+	re->i.convertdone = TRUE;
 	RE_Database_Free(re);
 	re->strandsurface= strandsurface;
 	
@@ -5873,6 +5872,7 @@
 	/* free dbase and make the real one */
 	strandsurface= re->strandsurface;
 	memset(&re->strandsurface, 0, sizeof(ListBase));
+	re->i.convertdone = TRUE;
 	RE_Database_Free(re);
 	re->strandsurface= strandsurface;