Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 21 Dec 2017 10:17:34 +0000 (11:17 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 21 Dec 2017 10:17:34 +0000 (11:17 +0100)
1  2 
intern/cycles/device/device_cuda.cpp
source/blender/depsgraph/DEG_depsgraph_debug.h
source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
source/blender/depsgraph/intern/depsgraph_eval.cc
source/blender/depsgraph/intern/depsgraph_intern.h
source/blender/depsgraph/intern/nodes/deg_node.cc
source/blender/depsgraph/intern/nodes/deg_node_component.h
source/blender/makesrna/intern/rna_depsgraph.c

Simple merge
index f57721240886134de7b985474f36a6c0af4b5af7,88954f6f0dc0a8c1f23ea2c8f4d850f88a4c2aa8..68c2eb129140c577f35041d40d29a032805b2643
@@@ -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, "[");
index 0603e46719229e7c553d8e8b79262fb3c5456ed7,0448dbe2c8d708d14fd3896d396f51a808efb9e5..ad1a850a8073dbb323da836eacc1bbf75e223135
@@@ -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 */