griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Refactor: Bypass DEG_foreach_dependent_ID_component when not needed

Browse Source 
The `DEG_foreach_dependent_ID_component` is only used to mark objects
whose base will have `BA_SNAP_FIX_DEPS_FIASCO`.

If this flag is not used, the `DEG_foreach_dependent_ID_component` is
also not needed.
This commit is contained in:
Germano Cavalcante
2025-07-15 20:05:12 -03:00
parent a2a2638a57
commit dfd4d2914f
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
source/blender/editors/transform/transform_convert_object.cc
View File

@@ -298,8 +298,13 @@ static void ObjectToTransData(TransInfo *t, TransData *td, TransDataExtension *t
}
}
static void trans_object_base_deps_flag_prepare(const Scene *scene, ViewLayer *view_layer)
static void trans_object_base_deps_flag_prepare(const TransInfo *t,
const Scene *scene,
ViewLayer *view_layer)
{
if (t->options & CTX_OBMODE_XFORM_OBDATA) {
return;
}
BKE_view_layer_synced_ensure(scene, view_layer);
LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer)) {
base->object->id.tag &= ~ID_TAG_DOIT;
@@ -318,10 +323,13 @@ static void set_trans_object_base_deps_flag_cb(ID *id, eDepsObjectComponentType
id->tag |= ID_TAG_DOIT;
}
static void flush_trans_object_base_deps_flag(Depsgraph *depsgraph, Object *object)
static void flush_trans_object_base_deps_flag(const TransInfo *t, Object *object)
{
if (t->options & CTX_OBMODE_XFORM_OBDATA) {
return;
}
object->id.tag |= ID_TAG_DOIT;
DEG_foreach_dependent_ID_component(depsgraph,
DEG_foreach_dependent_ID_component(t->depsgraph,
&object->id,
DEG_OB_COMP_TRANSFORM,
DEG_FOREACH_COMPONENT_IGNORE_TRANSFORM_SOLVERS,
@@ -332,13 +340,13 @@ static void trans_object_base_deps_flag_finish(const TransInfo *t,
const Scene *scene,
ViewLayer *view_layer)
{
if ((t->options & CTX_OBMODE_XFORM_OBDATA) == 0) {
BKE_view_layer_synced_ensure(scene, view_layer);
LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer)) {
if (base->object->id.tag & ID_TAG_DOIT) {
base->flag_legacy |= BA_SNAP_FIX_DEPS_FIASCO;
}
if (t->options & CTX_OBMODE_XFORM_OBDATA) {
return;
}
BKE_view_layer_synced_ensure(scene, view_layer);
LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer)) {
if (base->object->id.tag & ID_TAG_DOIT) {
base->flag_legacy |= BA_SNAP_FIX_DEPS_FIASCO;
}
}
}
@@ -366,7 +374,7 @@ static void set_trans_object_base_flags(TransInfo *t)
/* Make sure depsgraph is here. */
DEG_graph_relations_update(depsgraph);
/* Clear all flags we need. It will be used to detect dependencies. */
trans_object_base_deps_flag_prepare(scene, view_layer);
trans_object_base_deps_flag_prepare(t, scene, view_layer);
/* Traverse all bases and set all possible flags. */
BKE_view_layer_synced_ensure(scene, view_layer);
LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer)) {
@@ -397,7 +405,7 @@ static void set_trans_object_base_flags(TransInfo *t)
base->flag_legacy |= BA_WAS_SEL;
}
}
flush_trans_object_base_deps_flag(depsgraph, ob);
flush_trans_object_base_deps_flag(t, ob);
}
}
/* Store temporary bits in base indicating that base is being modified
@@ -427,11 +435,9 @@ static int count_proportional_objects(TransInfo *t)
int total = 0;
ViewLayer *view_layer = t->view_layer;
View3D *v3d = static_cast<View3D *>(t->view);
Main *bmain = CTX_data_main(t->context);
Scene *scene = t->scene;
Depsgraph *depsgraph = BKE_scene_ensure_depsgraph(bmain, scene, view_layer);
/* Clear all flags we need. It will be used to detect dependencies. */
trans_object_base_deps_flag_prepare(scene, view_layer);
trans_object_base_deps_flag_prepare(t, scene, view_layer);
/* Rotations around local centers are allowed to propagate, so we take all objects. */
if (!((t->around == V3D_AROUND_LOCAL_ORIGINS) && ELEM(t->mode, TFM_ROTATION, TFM_TRACKBALL))) {
/* Mark all parents. */
@@ -466,7 +472,7 @@ static int count_proportional_objects(TransInfo *t)
(base->flag & BASE_SELECTED) == 0 &&
(BASE_EDITABLE(v3d, base) && BASE_SELECTABLE(v3d, base)))
{
flush_trans_object_base_deps_flag(depsgraph, ob);
flush_trans_object_base_deps_flag(t, ob);
total += 1;
}
}