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

Draw: Re-enable Handle Ranges optimizations

Browse Source 
Re-enable the optimizations from #140378, which were reverted in
f8303efd57 until I could fix the
regressions.

Disable handle ranges for bounding boxes.
Take into account DupliObject and parent Object overrides in
`supports_handle_ranges`.

Fix #145446
Fix #145420

Pull Request: https://projects.blender.org/blender/blender/pulls/147069
This commit is contained in:
Miguel Pozo
2025-10-01 17:50:33 +02:00
parent 7ad5d04aeb
commit 44c87179a9
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/draw/intern/draw_context.cc
View File

@@ -679,9 +679,20 @@ ObjectRef::ObjectRef(Object &ob, Object *dupli_parent, const VectorList<DupliObj
namespace blender::draw {
static bool supports_handle_ranges(Object *ob)
static bool supports_handle_ranges(DupliObject *dupli, Object *parent)
{
if (ob->type == OB_MESH) {
int ob_type = dupli->ob_data ? BKE_object_obdata_to_type(dupli->ob_data) : OB_EMPTY;
if (!ELEM(ob_type, OB_MESH, OB_CURVES_LEGACY, OB_SURF, OB_FONT, OB_POINTCLOUD, OB_GREASE_PENCIL))
{
return false;
}
Object *ob = dupli->ob;
if (min(ob->dt, parent->dt) == OB_BOUNDBOX) {
return false;
}
if (ob_type == OB_MESH) {
/* Hair drawing doesn't support handle ranges. */
LISTBASE_FOREACH (ParticleSystem *, psys, &ob->particlesystem) {
const int draw_as = (psys->part->draw_as == PART_DRAW_REND) ? psys->part->ren_as :
@@ -693,7 +704,8 @@ static bool supports_handle_ranges(Object *ob)
/* Smoke drawing doesn't support handle ranges. */
return !BKE_modifiers_findby_type(ob, eModifierType_Fluid);
}
return ELEM(ob->type, OB_CURVES_LEGACY, OB_SURF, OB_FONT, OB_POINTCLOUD, OB_GREASE_PENCIL);
return true;
}
enum class InstancesFlags : uint8_t {
@@ -771,13 +783,9 @@ static void foreach_obref_in_scene(DRWContext &draw_ctx,
eEvaluationMode eval_mode = DEG_get_mode(depsgraph);
View3D *v3d = draw_ctx.v3d;
#if 0 /* Temporary disabled until we can fix all the issues that it causes. */
/* EEVEE is not supported for now. */
const bool engines_support_handle_ranges = (v3d && v3d->shading.type <= OB_SOLID) ||
BKE_scene_uses_blender_workbench(draw_ctx.scene);
#else
const bool engines_support_handle_ranges = false;
#endif
DEGObjectIterSettings deg_iter_settings = {nullptr};
deg_iter_settings.depsgraph = depsgraph;
@@ -842,7 +850,7 @@ static void foreach_obref_in_scene(DRWContext &draw_ctx,
}
#endif
if (!engines_support_handle_ranges || !supports_handle_ranges(dupli.ob)) {
if (!engines_support_handle_ranges || !supports_handle_ranges(&dupli, ob)) {
/* Sync the dupli as a single object. */
if (!evil::DEG_iterator_temp_object_from_dupli(
ob, &dupli, eval_mode, false, &tmp_object, &tmp_runtime) ||