diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-05-02 12:46:56 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-05-02 18:09:44 +0300 |
| commit | 65e6654c85a5b2fd44444057e87bd36d6ee0597a (patch) | |
| tree | 15399f3ecb648f3ce99b93b17317a8a7e838c730 /source/blender/blenkernel/intern/layer.c | |
| parent | 2f4dea0ef987abe0e2c11ed01df1645a59c58a74 (diff) | |
Depsgraph: Allow per-depsgraph debug flags
Currently only affects EVALUATION debug messages, rest are to be
supported on per-depsgraph level.
Diffstat (limited to 'source/blender/blenkernel/intern/layer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/layer.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index 215826454a9..9ab318bc58d 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -54,6 +54,7 @@ #include "DNA_workspace_types.h" #include "DEG_depsgraph.h" +#include "DEG_depsgraph_debug.h" #include "DEG_depsgraph_query.h" #include "DRW_engine.h" @@ -2369,9 +2370,9 @@ static void idproperty_reset(IDProperty **props, IDProperty *props_ref) } } -static void layer_eval_layer_collection_pre(ID *owner_id, ViewLayer *view_layer) +static void layer_eval_layer_collection_pre(Depsgraph *depsgraph, ID *owner_id, ViewLayer *view_layer) { - DEG_debug_print_eval(__func__, view_layer->name, view_layer); + DEG_debug_print_eval(depsgraph, __func__, view_layer->name, view_layer); Scene *scene = (GS(owner_id->name) == ID_SCE) ? (Scene *)owner_id : NULL; for (Base *base = view_layer->object_bases.first; base != NULL; base = base->next) { @@ -2415,7 +2416,7 @@ static void layer_eval_layer_collection(Depsgraph *depsgraph, LayerCollection *layer_collection, LayerCollection *parent_layer_collection) { - if (G.debug & G_DEBUG_DEPSGRAPH_EVAL) { + if (DEG_get_debug_flags(depsgraph) & G_DEBUG_DEPSGRAPH_EVAL) { /* TODO)sergey): Try to make it more generic and handled by depsgraph messaging. */ printf("%s on %s (%p) [%s], parent %s (%p) [%s]\n", __func__, @@ -2471,9 +2472,9 @@ static void layer_eval_layer_collection(Depsgraph *depsgraph, } } -static void layer_eval_layer_collection_post(ViewLayer *view_layer) +static void layer_eval_layer_collection_post(Depsgraph *depsgraph, ViewLayer *view_layer) { - DEG_debug_print_eval(__func__, view_layer->name, view_layer); + DEG_debug_print_eval(depsgraph, __func__, view_layer->name, view_layer); /* Create array of bases, for fast index-based lookup. */ const int num_object_bases = BLI_listbase_count(&view_layer->object_bases); MEM_SAFE_FREE(view_layer->object_bases_array); @@ -2511,11 +2512,11 @@ void BKE_layer_eval_view_layer(struct Depsgraph *depsgraph, struct ID *owner_id, ViewLayer *view_layer) { - layer_eval_layer_collection_pre(owner_id, view_layer); + layer_eval_layer_collection_pre(depsgraph, owner_id, view_layer); layer_eval_collections_recurse(depsgraph, &view_layer->layer_collections, NULL); - layer_eval_layer_collection_post(view_layer); + layer_eval_layer_collection_post(depsgraph, view_layer); } void BKE_layer_eval_view_layer_indexed(struct Depsgraph *depsgraph, |