From 68ca12a7fc0eea117103d894609eb46c169ec88b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dietrich?= Date: Wed, 27 Apr 2022 10:22:07 +0200 Subject: Fix T96283: last disabled subsurf is used for GPU subdivision When more than one, consecutive, subdivision modifier is used on a Mesh, the last subsurf modifier is used for GPU subdivision even though it might be disabled. This is because retrieving the last subsurf modifier in the draw code did not check whether the modifier was disabled or not. To fix this, the session UUID of the modifier which delegated evaluation to the GPU code is cached and used in the draw to select the right subsurf modifier. Differential Revision: https://developer.blender.org/D14488 --- source/blender/draw/intern/draw_cache_impl_subdivision.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/draw/intern') diff --git a/source/blender/draw/intern/draw_cache_impl_subdivision.cc b/source/blender/draw/intern/draw_cache_impl_subdivision.cc index c859a72b371..1b84ac9b5a6 100644 --- a/source/blender/draw/intern/draw_cache_impl_subdivision.cc +++ b/source/blender/draw/intern/draw_cache_impl_subdivision.cc @@ -1898,7 +1898,8 @@ static bool draw_subdiv_create_requested_buffers(const Scene *scene, const bool /*use_hide*/, OpenSubdiv_EvaluatorCache *evaluator_cache) { - SubsurfModifierData *smd = BKE_object_get_last_subsurf_modifier(ob); + SubsurfModifierData *smd = reinterpret_cast( + BKE_modifiers_findby_session_uuid(ob, &mesh->runtime.subsurf_session_uuid)); BLI_assert(smd); const bool is_final_render = DRW_state_is_scene_render(); -- cgit v1.2.3