From 1647d89cf14b0286043b5d54398ecde8e132d042 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 9 Aug 2016 14:33:00 +0200 Subject: Fix T49027: Sequence uses too much memory when rendering scene with lots of movie strips Now we free sequencer cache and close all unneeded FFmpeg handles when rendering. This is the same logic as image sequence memory freeding. --- source/blender/render/intern/source/pipeline.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source/blender/render') diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 604693f486e..ec629aa2863 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -2785,6 +2785,7 @@ static void do_render_all_options(Render *re) /* ensure no images are in memory from previous animated sequences */ BKE_image_all_free_anim_ibufs(re->r.cfra); + BKE_sequencer_all_free_anim_ibufs(re->r.cfra); if (RE_engine_render(re, 1)) { /* in this case external render overrides all */ -- cgit v1.2.3 From 3bbf8fbaeb0dff1aaacdfe97154c3706424da9c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20T=C3=B6nne?= Date: Tue, 9 Aug 2016 15:32:58 +0200 Subject: Fix for isfinite breaking builds when WITH_CXX11 is enabled. This happens when cmath.h is included after math.h in cpp code. Kudos to Sergey for pointing this out. --- source/blender/render/intern/raytrace/rayobject_rtbuild.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/blender/render') diff --git a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp index 02a49fc3c8f..6abe1061247 100644 --- a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp +++ b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp @@ -42,6 +42,8 @@ #include "BLI_math.h" #include "BLI_utildefines.h" +using std::isfinite; + static bool selected_node(RTBuilder::Object *node) { return node->selected; -- cgit v1.2.3 From 02719521d2e25abcc8ffcccc086d3a651986f52f Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 9 Aug 2016 15:47:51 +0200 Subject: Attempt to fix previous commit for non-c++11 builds --- source/blender/render/intern/raytrace/rayobject_rtbuild.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/blender/render') diff --git a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp index 6abe1061247..724a809077e 100644 --- a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp +++ b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp @@ -42,7 +42,9 @@ #include "BLI_math.h" #include "BLI_utildefines.h" +#if __cplusplus >= 201103L using std::isfinite; +#endif static bool selected_node(RTBuilder::Object *node) { -- cgit v1.2.3