[Bf-blender-cvs] [36e7de9eb32] blender2.8: Merge branch 'master' into blender2.8

[Sergey Sharybin]

Commit: 36e7de9eb329e122605e3fe1ba80585d3aff1b26
Author: Sergey Sharybin
Date:   Fri Mar 16 12:26:37 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB36e7de9eb329e122605e3fe1ba80585d3aff1b26

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenkernel/BKE_global.h
index 2b670cdf9dd,832b4164613..9adc00a67e6
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@@ -131,11 -132,10 +132,11 @@@ enum 
  	                     G_DEBUG_DEPSGRAPH_EVAL |
  	                     G_DEBUG_DEPSGRAPH_TAG |
  	                     G_DEBUG_DEPSGRAPH_TIME),
- 	G_DEBUG_SIMDATA =   (1 << 13), /* sim debug data display */
- 	G_DEBUG_GPU_MEM =   (1 << 14), /* gpu memory in status bar */
- 	G_DEBUG_GPU =        (1 << 15), /* gpu debug */
- 	G_DEBUG_IO = (1 << 13),   /* IO Debugging (for Collada, ...)*/
- 	G_DEBUG_GPU_SHADERS = (1 << 16),   /* GLSL shaders */
+ 	G_DEBUG_SIMDATA =   (1 << 14), /* sim debug data display */
+ 	G_DEBUG_GPU_MEM =   (1 << 15), /* gpu memory in status bar */
 -	G_DEBUG_GPU =       (1 << 16), /* gpu debug */
++	G_DEBUG_GPU =        (1 << 16), /* gpu debug */
+ 	G_DEBUG_IO = (1 << 17),   /* IO Debugging (for Collada, ...)*/
++	G_DEBUG_GPU_SHADERS = (1 << 18),   /* GLSL shaders */
  };
  
  #define G_DEBUG_ALL  (G_DEBUG | G_DEBUG_FFMPEG | G_DEBUG_PYTHON | G_DEBUG_EVENTS | G_DEBUG_WM | G_DEBUG_JOBS | \
diff --cc source/blender/depsgraph/intern/depsgraph.cc
index a05e422d602,66ddaa6b0d5..a2e6993e442
--- a/source/blender/depsgraph/intern/depsgraph.cc
+++ b/source/blender/depsgraph/intern/depsgraph.cc
@@@ -552,8 -512,18 +579,10 @@@ void DEG_editors_set_update_cb(DEG_Edit
  {
  	DEG::deg_editor_update_id_cb = id_func;
  	DEG::deg_editor_update_scene_cb = scene_func;
 -	DEG::deg_editor_update_scene_pre_cb = scene_pre_func;
 -}
 -
 -void DEG_editors_update_pre(Main *bmain, Scene *scene, bool time)
 -{
 -	if (DEG::deg_editor_update_scene_pre_cb != NULL) {
 -		DEG::deg_editor_update_scene_pre_cb(bmain, scene, time);
 -	}
  }
  
+ /* Evaluation and debug */
+ 
  void DEG_debug_print_eval(const char *function_name,
                            const char *object_name,
                            const void *object_address)
diff --cc source/blender/depsgraph/intern/depsgraph_intern.h
index e310608b25e,89432e17f87..9961723ed17
--- a/source/blender/depsgraph/intern/depsgraph_intern.h
+++ b/source/blender/depsgraph/intern/depsgraph_intern.h
@@@ -119,10 -116,8 +119,14 @@@ void deg_editors_scene_update(const DEG
  		} \
  	} while (0)
  
 +#define DEG_ERROR_PRINTF(...)               \
 +	do {                                    \
 +		fprintf(stderr, __VA_ARGS__);       \
 +		fflush(stderr);                     \
 +	} while (0)
 +
+ bool deg_terminal_do_color(void);
+ string deg_color_for_pointer(const void *pointer);
+ string deg_color_end(void);
+ 
  }  // namespace DEG
diff --cc source/creator/creator_args.c
index f5ec13fc0df,25f8d732c58..df4946a8175
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@@ -1854,12 -1880,13 +1856,14 @@@ void main_args_setup(bContext *C, bArg
  	            CB_EX(arg_handle_debug_mode_generic_set, depsgraph_time), (void *)G_DEBUG_DEPSGRAPH_TIME);
  	BLI_argsAdd(ba, 1, NULL, "--debug-depsgraph-no-threads",
  	            CB_EX(arg_handle_debug_mode_generic_set, depsgraph_no_threads), (void *)G_DEBUG_DEPSGRAPH_NO_THREADS);
+ 	BLI_argsAdd(ba, 1, NULL, "--debug-depsgraph-pretty",
+ 	            CB_EX(arg_handle_debug_mode_generic_set, depsgraph_pretty), (void *)G_DEBUG_DEPSGRAPH_PRETTY);
  	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, "--debug-gpu-shaders",
 +	            CB_EX(arg_handle_debug_mode_generic_set, gpumem), (void *)G_DEBUG_GPU_SHADERS);
  
 -	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-copy-on-write", CB(arg_handle_use_copy_on_write), NULL);
  
  	BLI_argsAdd(ba, 1, NULL, "--verbose", CB(arg_handle_verbosity_set), NULL);