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/object_update.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/object_update.c')
-rw-r--r-- | source/blender/blenkernel/intern/object_update.c | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c index c8612c1d55c..e3d42f3ad60 100644 --- a/source/blender/blenkernel/intern/object_update.c +++ b/source/blender/blenkernel/intern/object_update.c @@ -68,10 +68,9 @@ #include "DEG_depsgraph_query.h" -void BKE_object_eval_local_transform(Depsgraph *UNUSED(depsgraph), - Object *ob) +void BKE_object_eval_local_transform(Depsgraph *depsgraph, Object *ob) { - DEG_debug_print_eval(__func__, ob->id.name, ob); + DEG_debug_print_eval(depsgraph, __func__, ob->id.name, ob); /* calculate local matrix */ BKE_object_to_mat4(ob, ob->obmat); @@ -79,7 +78,7 @@ void BKE_object_eval_local_transform(Depsgraph *UNUSED(depsgraph), /* Evaluate parent */ /* NOTE: based on solve_parenting(), but with the cruft stripped out */ -void BKE_object_eval_parent(Depsgraph *UNUSED(depsgraph), +void BKE_object_eval_parent(Depsgraph *depsgraph, Scene *scene, Object *ob) { @@ -89,7 +88,7 @@ void BKE_object_eval_parent(Depsgraph *UNUSED(depsgraph), float tmat[4][4]; float locmat[4][4]; - DEG_debug_print_eval(__func__, ob->id.name, ob); + DEG_debug_print_eval(depsgraph, __func__, ob->id.name, ob); /* get local matrix (but don't calculate it, as that was done already!) */ // XXX: redundant? @@ -118,7 +117,7 @@ void BKE_object_eval_constraints(Depsgraph *depsgraph, bConstraintOb *cob; float ctime = BKE_scene_frame_get(scene); - DEG_debug_print_eval(__func__, ob->id.name, ob); + DEG_debug_print_eval(depsgraph, __func__, ob->id.name, ob); /* evaluate constraints stack */ /* TODO: split this into: @@ -134,9 +133,9 @@ void BKE_object_eval_constraints(Depsgraph *depsgraph, BKE_constraints_clear_evalob(cob); } -void BKE_object_eval_done(Depsgraph *UNUSED(depsgraph), Object *ob) +void BKE_object_eval_done(Depsgraph *depsgraph, Object *ob) { - DEG_debug_print_eval(__func__, ob->id.name, ob); + DEG_debug_print_eval(depsgraph, __func__, ob->id.name, ob); /* Set negative scale flag in object. */ if (is_negative_m4(ob->obmat)) ob->transflag |= OB_NEG_SCALE; @@ -315,7 +314,7 @@ void BKE_object_eval_uber_data(Depsgraph *depsgraph, Scene *scene, Object *ob) { - DEG_debug_print_eval(__func__, ob->id.name, ob); + DEG_debug_print_eval(depsgraph, __func__, ob->id.name, ob); BLI_assert(ob->type != OB_ARMATURE); BKE_object_handle_data_update(depsgraph, scene, ob); @@ -389,11 +388,11 @@ void BKE_object_eval_uber_data(Depsgraph *depsgraph, } } -void BKE_object_eval_cloth(Depsgraph *UNUSED(depsgraph), +void BKE_object_eval_cloth(Depsgraph *depsgraph, Scene *scene, Object *object) { - DEG_debug_print_eval(__func__, object->id.name, object); + DEG_debug_print_eval(depsgraph, __func__, object->id.name, object); BKE_ptcache_object_reset(scene, object, PTCACHE_RESET_DEPSGRAPH); } @@ -413,19 +412,17 @@ void BKE_object_eval_transform_all(Depsgraph *depsgraph, BKE_object_eval_done(depsgraph, object); } -void BKE_object_eval_update_shading(Depsgraph *UNUSED(depsgraph), - Object *object) +void BKE_object_eval_update_shading(Depsgraph *depsgraph, Object *object) { - DEG_debug_print_eval(__func__, object->id.name, object); + DEG_debug_print_eval(depsgraph, __func__, object->id.name, object); if (object->type == OB_MESH) { BKE_mesh_batch_cache_dirty(object->data, BKE_MESH_BATCH_DIRTY_SHADING); } } -void BKE_object_data_select_update(Depsgraph *UNUSED(depsgraph), - struct ID *object_data) +void BKE_object_data_select_update(Depsgraph *depsgraph, ID *object_data) { - DEG_debug_print_eval(__func__, object_data->name, object_data); + DEG_debug_print_eval(depsgraph, __func__, object_data->name, object_data); switch (GS(object_data->name)) { case ID_ME: BKE_mesh_batch_cache_dirty((Mesh *)object_data, @@ -444,7 +441,7 @@ void BKE_object_data_select_update(Depsgraph *UNUSED(depsgraph), } } -void BKE_object_eval_flush_base_flags(Depsgraph *UNUSED(depsgraph), +void BKE_object_eval_flush_base_flags(Depsgraph *depsgraph, Scene *scene, const int view_layer_index, Object *object, int base_index, const bool is_from_set) @@ -459,7 +456,7 @@ void BKE_object_eval_flush_base_flags(Depsgraph *UNUSED(depsgraph), Base *base = view_layer->object_bases_array[base_index]; BLI_assert(base->object == object); - DEG_debug_print_eval(__func__, object->id.name, object); + DEG_debug_print_eval(depsgraph, __func__, object->id.name, object); /* Make sure we have the base collection settings is already populated. * This will fail when BKE_layer_eval_layer_collection_pre hasn't run yet. |