[Bf-blender-cvs] [531d3cc] depsgraph_refactor: Depsgraph: Fix for clang and legacy depsgraph disabled

Sergey Sharybin noreply at git.blender.org
Wed Dec 31 11:21:30 CET 2014


Commit: 531d3cc30aa89c69e832fac7ab96127da2f113eb
Author: Sergey Sharybin
Date:   Wed Dec 31 15:21:05 2014 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rB531d3cc30aa89c69e832fac7ab96127da2f113eb

Depsgraph: Fix for clang and legacy depsgraph disabled

===================================================================

M	source/blender/blenkernel/intern/depsgraph.c

===================================================================

diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index ec305be..d3663a9 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -3292,6 +3292,7 @@ bool DAG_is_acyclic(Scene *scene)
 DagNodeQueue *queue_create(int UNUSED(slots))
 {
 	BLI_assert(!"Should not be used with new dependnecy graph");
+	return NULL;
 }
 
 void queue_raz(DagNodeQueue *UNUSED(queue))
@@ -3337,6 +3338,7 @@ DagForest *build_dag(Main *UNUSED(bmain),
                      short UNUSED(mask))
 {
 	BLI_assert(!"Should not be used with new dependnecy graph");
+	return NULL;
 }
 
 void free_forest(DagForest *UNUSED(Dag))




More information about the Bf-blender-cvs mailing list