2 files changed, 6 insertions, 8 deletions
diff --git a/source/creator/creator.c b/source/creator/creator.c
index a59a45f885c..076be40ce94 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -64,7 +64,6 @@
 #include "BKE_node.h"
 #include "BKE_sound.h"
 #include "BKE_image.h"
-#include "BKE_particle.h"
 
 
 #include "IMB_imbuf.h"  /* for IMB_init */
@@ -402,7 +401,6 @@ int main(
 
 	RE_engines_init();
 	init_nodesystem();
-	psys_init_rng();
 	/* end second init */
 
 
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c
index 4eb72fb1619..06119b35e37 100644
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@ -1195,13 +1195,13 @@ static int arg_handle_depsgraph_use_new(int UNUSED(argc), const char **UNUSED(ar
 	return 0;
 }
 
-static const char arg_handle_basic_shader_glsl_use_new_doc[] =
-"\n\tUse new GLSL basic shader"
+static const char arg_handle_basic_shader_use_legacy_doc[] =
+"\n\tUse legacy (non-GLSL) basic shader"
 ;
-static int arg_handle_basic_shader_glsl_use_new(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
+static int arg_handle_basic_shader_use_legacy(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
 {
-	printf("Using new GLSL basic shader.\n");
-	GPU_basic_shader_use_glsl_set(true);
+	printf("Using legacy (non-GLSL) basic shader.\n");
+	GPU_basic_shader_use_glsl_set(false);
 	return 0;
 }
 
@@ -1841,7 +1841,7 @@ void main_args_setup(bContext *C, bArgs *ba, SYS_SystemHandle *syshandle)
 	            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, "--enable-legacy-basic-shader", CB(arg_handle_basic_shader_use_legacy), NULL);
 
 	BLI_argsAdd(ba, 1, NULL, "--verbose", CB(arg_handle_verbosity_set), NULL);