diff options
Diffstat (limited to 'source/creator')
-rw-r--r-- | source/creator/creator.c | 7 | ||||
-rw-r--r-- | source/creator/creator_args.c | 26 |
2 files changed, 3 insertions, 30 deletions
diff --git a/source/creator/creator.c b/source/creator/creator.c index a59a45f885c..4e090b0b19f 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -56,7 +56,6 @@ #include "BKE_brush.h" #include "BKE_cachefile.h" #include "BKE_context.h" -#include "BKE_depsgraph.h" /* for DAG_init */ #include "BKE_font.h" #include "BKE_global.h" #include "BKE_material.h" @@ -66,6 +65,7 @@ #include "BKE_image.h" #include "BKE_particle.h" +#include "DEG_depsgraph.h" #include "IMB_imbuf.h" /* for IMB_init */ @@ -231,8 +231,7 @@ int main( /* --- end declarations --- */ - /* ensure we free data on early-exit */ - struct CreatorAtExitData app_init_data = {NULL}; + /* ensure we free data on early-exit */ struct CreatorAtExitData app_init_data = {NULL}; BKE_blender_atexit_register(callback_main_atexit, &app_init_data); #ifdef WIN32 @@ -361,7 +360,7 @@ int main( BKE_cachefiles_init(); BKE_images_init(); BKE_modifier_init(); - DAG_init(); + DEG_register_node_types(); BKE_brush_system_init(); RE_texture_rng_init(); diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index 658a0b2db08..3850846b0b9 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -55,8 +55,6 @@ #include "BKE_sound.h" #include "BKE_image.h" -#include "DEG_depsgraph.h" - #ifdef WITH_FFMPEG #include "IMB_imbuf.h" #endif @@ -587,7 +585,6 @@ static int arg_handle_print_help(int UNUSED(argc), const char **UNUSED(argv), vo printf("\n"); printf("Experimental Features:\n"); - BLI_argsPrintArgDoc(ba, "--enable-new-depsgraph"); BLI_argsPrintArgDoc(ba, "--enable-new-basic-shader-glsl"); /* Other options _must_ be last (anything not handled will show here) */ @@ -1185,26 +1182,6 @@ static int arg_handle_threads_set(int argc, const char **argv, void *UNUSED(data } } -static const char arg_handle_depsgraph_use_new_doc[] = -"\n\tUse new dependency graph" -; -static int arg_handle_depsgraph_use_new(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data)) -{ - printf("Using new dependency graph.\n"); - DEG_depsgraph_switch_to_new(); - return 0; -} - -static const char arg_handle_basic_shader_glsl_use_new_doc[] = -"\n\tUse new GLSL basic shader" -; -static int arg_handle_basic_shader_glsl_use_new(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data)) -{ - printf("Using new GLSL basic shader.\n"); - GPU_basic_shader_use_glsl_set(true); - return 0; -} - static const char arg_handle_verbosity_set_doc[] = "<verbose>\n" "\tSet logging verbosity level." @@ -1842,9 +1819,6 @@ 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-new-basic-shader-glsl", CB(arg_handle_basic_shader_glsl_use_new), NULL); - BLI_argsAdd(ba, 1, NULL, "--verbose", CB(arg_handle_verbosity_set), NULL); BLI_argsAdd(ba, 1, NULL, "--factory-startup", CB(arg_handle_factory_startup_set), NULL); |