[Bf-blender-cvs] [a601d5d] object_nodes: Enable the new depsgraph by default.

Lukas Tönne noreply at git.blender.org
Mon May 16 12:38:31 CEST 2016


Commit: a601d5d18fd46005c2b2ceae59a90598047841e9
Author: Lukas Tönne
Date:   Mon May 16 12:37:14 2016 +0200
Branches: object_nodes
https://developer.blender.org/rBa601d5d18fd46005c2b2ceae59a90598047841e9

Enable the new depsgraph by default.

The blenvm system depends on the new depsgraph, so it doesn't make sense
to have to enable it every time.

The legacy depsgraph can still be switched back on by the --enable-legacy-depsgraph option.

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

M	source/blender/depsgraph/intern/depsgraph_eval.cc
M	source/creator/creator_args.c

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

diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc
index 66535f5..4a64542 100644
--- a/source/blender/depsgraph/intern/depsgraph_eval.cc
+++ b/source/blender/depsgraph/intern/depsgraph_eval.cc
@@ -53,7 +53,7 @@ extern "C" {
 #include "depsgraph_debug.h"
 
 #ifdef WITH_LEGACY_DEPSGRAPH
-static bool use_legacy_depsgraph = true;
+static bool use_legacy_depsgraph = false;
 #endif
 
 /* Unfinished and unused, and takes quite some pre-processing time. */
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c
index 69765fc..adaade1 100644
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@ -622,7 +622,7 @@ static int arg_handle_print_help(int UNUSED(argc), const char **UNUSED(argv), vo
 	/* keep last */
 	printf("\n");
 	printf("Experimental Features:\n");
-	BLI_argsPrintArgDoc(ba, "--enable-new-depsgraph");
+	BLI_argsPrintArgDoc(ba, "--enable-legacy-depsgraph");
 
 	exit(0);
 
@@ -1160,13 +1160,13 @@ static int arg_handle_threads_set(int argc, const char **argv, void *UNUSED(data
 	}
 }
 
-static const char arg_handle_depsgraph_use_new_doc[] =
+static const char arg_handle_depsgraph_use_legacy_doc[] =
 "\n\tUse new dependency graph"
 ;
-static int arg_handle_depsgraph_use_new(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
+static int arg_handle_depsgraph_use_legacy(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
 {
-	printf("Using new dependency graph.\n");
-	DEG_depsgraph_switch_to_new();
+	printf("Using legacy dependency graph.\n");
+	DEG_depsgraph_switch_to_legacy();
 	return 0;
 }
 
@@ -1804,7 +1804,7 @@ void main_args_setup(bContext *C, bArgs *ba, SYS_SystemHandle *syshandle)
 	BLI_argsAdd(ba, 1, NULL, "--debug-gpumem",
 	            CB_EX(arg_handle_debug_mode_generic_set, gpumem), (void *)G_DEBUG_GPU_MEM);
 
-	BLI_argsAdd(ba, 1, NULL, "--enable-new-depsgraph", CB(arg_handle_depsgraph_use_new), NULL);
+	BLI_argsAdd(ba, 1, NULL, "--enable-legacy-depsgraph", CB(arg_handle_depsgraph_use_legacy), NULL);
 
 	BLI_argsAdd(ba, 1, NULL, "--verbose", CB(arg_handle_verbosity_set), NULL);




More information about the Bf-blender-cvs mailing list