Merge branch 'blender-v4.4-release'

This commit is contained in:
Omar Emara
2025-03-04 09:34:41 +02:00
3 changed files with 17 additions and 5 deletions

View File

@@ -953,9 +953,11 @@ static void setup_app_data(bContext *C,
mode = LOAD_UI;
}
/* Free all render results, without this stale data gets displayed after loading files */
/* Free all render results and interactive compositor renders, without this stale data gets
* displayed after loading files */
if (mode != LOAD_UNDO) {
RE_FreeAllRenderResults();
RE_FreeInteractiveCompositorRenders();
}
/* Only make file-paths compatible when loading for real (not undo). */

View File

@@ -190,6 +190,11 @@ void RE_FreeViewRender(struct ViewRender *view_render);
*/
void RE_FreeAllRender(void);
/**
* On file load, free all interactive compositor renders.
*/
void RE_FreeInteractiveCompositorRenders(void);
/**
* On file load, free render results.
*/

View File

@@ -613,10 +613,7 @@ void RE_FreeAllRender()
RE_FreeRender(static_cast<Render *>(RenderGlobal.render_list.front()));
}
for (Render *render : RenderGlobal.interactive_compositor_renders.values()) {
RE_FreeRender(render);
}
RenderGlobal.interactive_compositor_renders.clear();
RE_FreeInteractiveCompositorRenders();
#ifdef WITH_FREESTYLE
/* finalize Freestyle */
@@ -624,6 +621,14 @@ void RE_FreeAllRender()
#endif
}
void RE_FreeInteractiveCompositorRenders()
{
for (Render *render : RenderGlobal.interactive_compositor_renders.values()) {
RE_FreeRender(render);
}
RenderGlobal.interactive_compositor_renders.clear();
}
void RE_FreeAllRenderResults()
{
for (Render *re : RenderGlobal.render_list) {