Commit: 733b9e4f99e8a0e7df8157284808a67cd901c4b6
Author: Sergey Sharybin
Date: Mon Mar 12 17:31:46 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB733b9e4f99e8a0e7df8157284808a67cd901c4b6
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/blenkernel/BKE_global.h
index 78d8271458d,fc614d0272a..2b670cdf9dd
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@@ -125,13 -125,16 +125,17 @@@ enum
G_DEBUG_DEPSGRAPH_BUILD = (1 << 8), /* depsgraph construction
messages */
G_DEBUG_DEPSGRAPH_EVAL = (1 << 9), /* depsgraph evaluation
messages */
G_DEBUG_DEPSGRAPH_TAG = (1 << 10), /* depsgraph tagging
messages */
- G_DEBUG_DEPSGRAPH_NO_THREADS = (1 << 11), /* single threaded depsgraph
*/
- G_DEBUG_DEPSGRAPH = (G_DEBUG_DEPSGRAPH_BUILD | G_DEBUG_DEPSGRAPH_EVAL |
G_DEBUG_DEPSGRAPH_TAG),
- G_DEBUG_SIMDATA = (1 << 12), /* sim debug data display */
- G_DEBUG_GPU_MEM = (1 << 13), /* gpu memory in status bar */
- G_DEBUG_GPU = (1 << 14), /* gpu debug */
+ G_DEBUG_DEPSGRAPH_TIME = (1 << 11), /* depsgraph timing
statistics and messages */
+ G_DEBUG_DEPSGRAPH_NO_THREADS = (1 << 12), /* single threaded depsgraph
*/
+ G_DEBUG_DEPSGRAPH = (G_DEBUG_DEPSGRAPH_BUILD |
+ 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 << 16), /* IO Debugging (for Collada, ...)*/
++ G_DEBUG_GPU = (1 << 15), /* gpu debug */
+ G_DEBUG_IO = (1 << 13), /* IO Debugging (for Collada, ...)*/
- G_DEBUG_GPU_SHADERS = (1 << 15), /* GLSL shaders */
++ G_DEBUG_GPU_SHADERS = (1 << 16), /* 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/blenloader/intern/readfile.c
index af97aeb8fc0,e1059a50412..21eccaff168
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -8523,7 -8241,7 +8523,8 @@@ static BHead *read_libblock(FileData *f
id->us = ID_FAKE_USERS(id);
id->icon_id = 0;
id->newid = NULL; /* Needed because .blend may have been saved with
crap value here... */
+ id->orig_id = NULL;
+ id->recalc = 0;
/* this case cannot be direct_linked: it's just the ID part */
if (bhead->code == ID_ID) {
diff --cc source/blender/depsgraph/intern/eval/deg_eval.cc
index c3aa84943d3,5f7bb4c3de5..a8fa73654a4
--- a/source/blender/depsgraph/intern/eval/deg_eval.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval.cc
@@@ -234,16 -256,20 +234,17 @@@ void deg_evaluate_on_refresh(Evaluation
if (BLI_gset_len(graph->entry_tags) == 0) {
return;
}
- DEG_DEBUG_PRINTF(EVAL, "%s: layers:%u, graph->layers:%u\n",
- __func__,
- layers,
- graph->layers);
+ const bool do_time_debug = ((G.debug & G_DEBUG_DEPSGRAPH_TIME) != 0);
/* Set time for the current graph evaluation context. */
TimeSourceDepsNode *time_src = graph->find_time_source();
+ eval_ctx->depsgraph = (::Depsgraph *)graph;
+ eval_ctx->view_layer = DEG_get_evaluated_view_layer((::Depsgraph
*)graph);
eval_ctx->ctime = time_src->cfra;
/* Set up evaluation context for depsgraph itself. */
DepsgraphEvalState state;
state.eval_ctx = eval_ctx;
state.graph = graph;
- state.do_stats = (G.debug_value != 0);
- state.layers = layers;
+ state.do_stats = do_time_debug;
/* Set up task scheduler and pull for threaded evaluation. */
TaskScheduler *task_scheduler;
bool need_free_scheduler;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
