[Bf-blender-cvs] [5cc793912ef] master: Fix T103671: memory leak in material preview render

Brecht Van Lommel noreply at git.blender.org
Fri Jan 6 16:20:35 CET 2023


Commit: 5cc793912efe4432b51cc7ddda4005c56fcbc93b
Author: Brecht Van Lommel
Date:   Fri Jan 6 16:04:03 2023 +0100
Branches: master
https://developer.blender.org/rB5cc793912efe4432b51cc7ddda4005c56fcbc93b

Fix T103671: memory leak in material preview render

Introduced with the fix for T103101.

===================================================================

M	source/blender/render/intern/engine.cc

===================================================================

diff --git a/source/blender/render/intern/engine.cc b/source/blender/render/intern/engine.cc
index 77b1e240cda..b26c685b691 100644
--- a/source/blender/render/intern/engine.cc
+++ b/source/blender/render/intern/engine.cc
@@ -1049,7 +1049,7 @@ bool RE_engine_render(Render *re, bool do_all)
    * inversion as this calls python to get the render passes, while python UI
    * code can also hold a lock on the render result. */
   const bool create_new_result = (re->result == nullptr || !(re->r.scemode & R_BUTS_PREVIEW));
-  RenderResult *new_result = engine_render_create_result(re);
+  RenderResult *new_result = (create_new_result) ? engine_render_create_result(re) : nullptr;
 
   BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE);
   if (create_new_result) {



More information about the Bf-blender-cvs mailing list