[Bf-blender-cvs] [a6fdd7d] object_nodes: Merge branch 'master' into object_nodes

[Lukas Tönne]

Commit: a6fdd7d8765ca5b87db4f2a7e562e9f4525dcc5a
Author: Lukas Tönne
Date:   Wed Jun 8 09:41:04 2016 +0200
Branches: object_nodes
https://developer.blender.org/rBa6fdd7d8765ca5b87db4f2a7e562e9f4525dcc5a

Merge branch 'master' into object_nodes

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



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

diff --cc build_files/cmake/macros.cmake
index 09fe757,3aa938b..04f655d
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@@ -552,10 -552,8 +552,11 @@@ function(SETUP_BLENDER_SORTED_LIBS
  		bf_modifiers
  		bf_bmesh
  		bf_gpu
+ 		bf_blenloader
  		bf_blenkernel
 +		bf_blenvm
 +		bf_blenvm_compile
 +		bf_blenvm_bvm
  		bf_physics
  		bf_nodes
  		bf_rna
diff --cc source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 5ca870c,18cfdb3..c383cae
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@@ -338,12 -300,14 +335,14 @@@ void DepsgraphNodeBuilder::build_scene(
  		// XXX: the way that proxies work needs to be completely reviewed!
  		if (ob->proxy) {
  			ob->proxy->proxy_from = ob;
- 			build_object(bmain, scene, base, ob->proxy);
  		}
  
+ 		/* object itself */
 -		build_object(scene, base, ob);
++		build_object(bmain, scene, base, ob);
+ 
  		/* Object dupligroup. */
  		if (ob->dup_group) {
 -			build_group(scene, base, ob->dup_group);
 +			build_group(bmain, scene, base, ob->dup_group);
  		}
  	}
  
diff --cc source/creator/creator_args.c
index adaade1,c89cdea..969cbdc
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@@ -586,6 -588,13 +588,13 @@@ static int arg_handle_print_help(int UN
  	printf("Other Options:\n");
  	BLI_argsPrintOtherDoc(ba);
  
+ 	/* keep last args */
+ 	printf("\n");
+ 	printf("Experimental Features:\n");
 -	BLI_argsPrintArgDoc(ba, "--enable-new-depsgraph");
++	BLI_argsPrintArgDoc(ba, "--enable-legacy-depsgraph");
+ 	BLI_argsPrintArgDoc(ba, "--enable-new-basic-shader-glsl");
+ 
+ 	printf("\n");
  	printf("Argument Parsing:\n");
  	printf("\tArguments must be separated by white space, eg:\n");
  	printf("\t# blender -ba test.blend\n");
@@@ -1804,7 -1818,8 +1818,8 @@@ void main_args_setup(bContext *C, bArg
  	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, "--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);