diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-08-10 16:06:40 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-08-10 16:06:40 +0300 |
| commit | 8fd4a8ab5db10757801a6aadc03f8248bcad73ed (patch) | |
| tree | fa78c024f3e139752d24fd2c1ad9abb9349ce3fa /source/blender/render | |
| parent | e7a32365cf9b43b97b1b1f8cd76e9834c9e4037a (diff) | |
| parent | 774beb7c3cf04cc42703a4a6ebb9a4836690b060 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/particle.c
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/raytrace/rayobject_rtbuild.cpp | 4 | ||||
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp index 02a49fc3c8f..724a809077e 100644 --- a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp +++ b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp @@ -42,6 +42,10 @@ #include "BLI_math.h" #include "BLI_utildefines.h" +#if __cplusplus >= 201103L +using std::isfinite; +#endif + static bool selected_node(RTBuilder::Object *node) { return node->selected; diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index fc99bedfa0f..363267bb363 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -2784,6 +2784,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 */ |