[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44668] trunk/blender/source/blender/ blenkernel/intern/depsgraph.c: Fixed typo in tracking-related tweaks for depsgraph resulting with crash

Sergey Sharybin sergey.vfx at gmail.com
Tue Mar 6 12:24:31 CET 2012


Revision: 44668
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44668
Author:   nazgul
Date:     2012-03-06 11:24:23 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
Fixed typo in tracking-related tweaks for depsgraph resulting with crash
in special cases (like setting camera's constraint clip if scene's clip is not set)

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/depsgraph.c

Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c	2012-03-06 09:19:13 UTC (rev 44667)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c	2012-03-06 11:24:23 UTC (rev 44668)
@@ -2593,8 +2593,11 @@
 		/* camera's matrix is used to orient reconstructed stuff,
 		   so it should happen tracking-related constraints recalculation
 		   when camera is changing (sergey) */
-		if(sce->camera && &sce->camera->id == id && object_get_movieclip(sce, sce->camera, 1)) {
-			dag_id_flush_update(sce, &sce->clip->id);
+		if(sce->camera && &sce->camera->id == id) {
+			MovieClip *clip = object_get_movieclip(sce, sce->camera, 1);
+
+			if(clip)
+				dag_id_flush_update(sce, clip);
 		}
 
 		/* update editors */




More information about the Bf-blender-cvs mailing list