From 8fc614fc1ba2bbfb7ba23bcbfebf853154a091aa Mon Sep 17 00:00:00 2001 From: Miguel Pozo Date: Wed, 19 Jun 2024 18:15:27 +0200 Subject: [PATCH] Fix: EEVEE: Use of scene before assignment Move update_eval_members to the top of init to avoid future issues. --- source/blender/draw/engines/eevee_next/eevee_instance.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/source/blender/draw/engines/eevee_next/eevee_instance.cc b/source/blender/draw/engines/eevee_next/eevee_instance.cc index a73c6e7bf77..7d7e91f593b 100644 --- a/source/blender/draw/engines/eevee_next/eevee_instance.cc +++ b/source/blender/draw/engines/eevee_next/eevee_instance.cc @@ -62,6 +62,7 @@ void Instance::init(const int2 &output_res, v3d = v3d_; rv3d = rv3d_; manager = DRW_manager_get(); + update_eval_members(); info = ""; @@ -93,8 +94,6 @@ void Instance::init(const int2 &output_res, sampling.reset(); } - update_eval_members(); - sampling.init(scene); camera.init(); film.init(output_res, output_rect); @@ -125,6 +124,7 @@ void Instance::init_light_bake(Depsgraph *depsgraph, draw::Manager *manager) drw_view = nullptr; v3d = nullptr; rv3d = nullptr; + update_eval_members(); is_light_bake = true; debug_mode = (eDebugMode)G.debug_value; @@ -132,8 +132,6 @@ void Instance::init_light_bake(Depsgraph *depsgraph, draw::Manager *manager) shaders.is_ready(true); - update_eval_members(); - sampling.init(scene); camera.init(); /* Film isn't used but init to avoid side effects in other module. */