[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54889] trunk/blender/source/blender/ blenkernel: Fix build error in depsgraph refactoring commit.

Brecht Van Lommel brechtvanlommel at pandora.be
Tue Feb 26 21:34:37 CET 2013


Revision: 54889
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54889
Author:   blendix
Date:     2013-02-26 20:34:37 +0000 (Tue, 26 Feb 2013)
Log Message:
-----------
Fix build error in depsgraph refactoring commit.

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

Modified: trunk/blender/source/blender/blenkernel/BKE_depsgraph.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_depsgraph.h	2013-02-26 18:35:16 UTC (rev 54888)
+++ trunk/blender/source/blender/blenkernel/BKE_depsgraph.h	2013-02-26 20:34:37 UTC (rev 54889)
@@ -65,6 +65,7 @@
 void DAG_scene_relations_update(struct Main *bmain, struct Scene *sce);
 void DAG_relations_tag_update(struct Main *bmain);
 void DAG_scene_relations_rebuild(struct Main *bmain, struct Scene *scene);
+void DAG_scene_free(struct Scene *sce);
 
 /* Update Tagging
  *

Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c	2013-02-26 18:35:16 UTC (rev 54888)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c	2013-02-26 20:34:37 UTC (rev 54889)
@@ -1429,6 +1429,15 @@
 		dag_scene_build(bmain, sce);
 }
 
+void DAG_scene_free(Scene *sce)
+{
+	if (sce->theDag) {
+		free_forest(sce->theDag);
+		MEM_freeN(sce->theDag);
+		sce->theDag = NULL;
+	}
+}
+
 static void lib_id_recalc_tag(Main *bmain, ID *id)
 {
 	id->flag |= LIB_ID_RECALC;

Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c	2013-02-26 18:35:16 UTC (rev 54888)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c	2013-02-26 20:34:37 UTC (rev 54889)
@@ -359,10 +359,7 @@
 		sce->toolsettings = NULL;
 	}
 	
-	if (sce->theDag) {
-		free_forest(sce->theDag);
-		MEM_freeN(sce->theDag);
-	}
+	DAG_scene_free(sce);
 	
 	if (sce->nodetree) {
 		ntreeFreeTree(sce->nodetree);




More information about the Bf-blender-cvs mailing list