[Bf-blender-cvs] [9f0d067c2e9] blender2.8: Merge branch 'master' into blender2.8

Sergey Sharybin noreply at git.blender.org
Thu Dec 21 11:17:46 CET 2017


Commit: 9f0d067c2e9c8dcb4c40b880b0bbcf8ad31b1f55
Author: Sergey Sharybin
Date:   Thu Dec 21 11:17:34 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB9f0d067c2e9c8dcb4c40b880b0bbcf8ad31b1f55

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
index f5772124088,88954f6f0dc..68c2eb12914
--- a/source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
+++ b/source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
@@@ -289,10 -285,12 +288,6 @@@ static void deg_debug_graphviz_node_sin
  {
  	const char *shape = "box";
  	string name = node->identifier();
- 	float priority = -1.0f;
- 	if (ctx.show_eval_priority && node->tclass == DEG_NODE_CLASS_OPERATION) {
- 		priority = ((OperationDepsNode *)node)->eval_priority;
 -	if (node->type == DEG_NODE_TYPE_ID_REF) {
 -		IDDepsNode *id_node = (IDDepsNode *)node;
 -		char buf[256];
 -		BLI_snprintf(buf, sizeof(buf), " (Layers: %u)", id_node->layers);
 -		name += buf;
--	}
  	deg_debug_fprintf(ctx, "// %s\n", name.c_str());
  	deg_debug_fprintf(ctx, "\"node_%p\"", node);
  	deg_debug_fprintf(ctx, "[");
diff --cc source/blender/depsgraph/intern/depsgraph_eval.cc
index 0603e467192,0448dbe2c8d..ad1a850a807
--- a/source/blender/depsgraph/intern/depsgraph_eval.cc
+++ b/source/blender/depsgraph/intern/depsgraph_eval.cc
@@@ -52,9 -53,40 +52,6 @@@ extern "C" 
  
  #include "intern/depsgraph.h"
  
- /* Unfinished and unused, and takes quite some pre-processing time. */
- #undef USE_EVAL_PRIORITY
 -#ifdef WITH_LEGACY_DEPSGRAPH
 -static bool use_legacy_depsgraph = true;
 -#endif
 -
 -bool DEG_depsgraph_use_legacy(void)
 -{
 -#ifdef DISABLE_NEW_DEPSGRAPH
 -	return true;
 -#elif defined(WITH_LEGACY_DEPSGRAPH)
 -	return use_legacy_depsgraph;
 -#else
 -	BLI_assert(!"Should not be used with new depsgraph");
 -	return false;
 -#endif
 -}
 -
 -void DEG_depsgraph_switch_to_legacy(void)
 -{
 -#ifdef WITH_LEGACY_DEPSGRAPH
 -	use_legacy_depsgraph = true;
 -#else
 -	BLI_assert(!"Should not be used with new depsgraph");
 -#endif
 -}
 -
 -void DEG_depsgraph_switch_to_new(void)
 -{
 -#ifdef WITH_LEGACY_DEPSGRAPH
 -	use_legacy_depsgraph = false;
 -#else
 -	BLI_assert(!"Should not be used with new depsgraph");
 -#endif
 -}
--
  /* ****************** */
  /* Evaluation Context */



More information about the Bf-blender-cvs mailing list