[Bf-blender-cvs] [978520a] depsgraph_refactor: Depsgraph: Fix compilation error after ogdf commit

[Sergey Sharybin]

Commit: 978520a17d7f12b69e9839680306e1c4a7a88719
Author: Sergey Sharybin
Date:   Thu Jan 29 20:17:50 2015 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rB978520a17d7f12b69e9839680306e1c4a7a88719

Depsgraph: Fix compilation error after ogdf commit

CMake should work now (ogdf stays disabled), should be no functional
changes for scons.

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

M	source/blender/makesrna/SConscript
M	source/blender/makesrna/intern/SConscript
M	source/blender/makesrna/intern/rna_depsgraph.c

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

diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript
index f8eb2e1..f8c175c 100644
--- a/source/blender/makesrna/SConscript
+++ b/source/blender/makesrna/SConscript
@@ -148,6 +148,9 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', '
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
 
+if env['WITH_BF_OGDF']:
+    defs.append('WITH_OGDF')
+
 rnalib = env.BlenderLib ( 'bf_rna', objs, Split(incs), defines=defs, libtype=['core','player'], priority = [165,20] )
 
 Return ('rnalib')
diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript
index afa4ab3..7736070 100644
--- a/source/blender/makesrna/intern/SConscript
+++ b/source/blender/makesrna/intern/SConscript
@@ -154,6 +154,9 @@ if env['WITH_BF_FREESTYLE']:
     defs.append('WITH_FREESTYLE')
     incs += ' ../../freestyle'
 
+if env['WITH_BF_OGDF']:
+    defs.append('WITH_OGDF')
+
 if env['OURPLATFORM'] == 'linux':
     cflags='-pthread'
 
diff --git a/source/blender/makesrna/intern/rna_depsgraph.c b/source/blender/makesrna/intern/rna_depsgraph.c
index fe643f6..ca80803 100644
--- a/source/blender/makesrna/intern/rna_depsgraph.c
+++ b/source/blender/makesrna/intern/rna_depsgraph.c
@@ -57,9 +57,14 @@ static void rna_Depsgraph_debug_graphviz(Depsgraph *graph, const char *filename)
 
 static void rna_Depsgraph_debug_ogdf(Depsgraph *graph, const char *filename)
 {
+#ifdef WITH_OGDF
 	if (filename != NULL) {
 		DEG_debug_ogdf(graph, filename);
 	}
+#else
+	(void)graph;
+	(void)filename;
+#endif
 }
 
 static void rna_Depsgraph_debug_rebuild(Depsgraph *UNUSED(graph), Main *bmain)