diff options
| author | Dalai Felinto <dalai@blender.org> | 2020-12-17 19:39:49 +0300 |
|---|---|---|
| committer | Dalai Felinto <dalai@blender.org> | 2020-12-17 19:39:49 +0300 |
| commit | 42b0389a9b05e51e17ba79540e88cd446b52fae7 (patch) | |
| tree | ee17716640f1b1133ae2ab4ca65cd92a63d09f15 /intern/cycles/render/scene.cpp | |
| parent | c5a17d5ea1ff786cb91cbcf3f12cd02f730c4143 (diff) | |
| parent | e7b698327cd91b371ff4fd43d1c117637224fded (diff) | |
Merge remote-tracking branch 'origin/master' into geometry-nodesgeometry-nodes
Diffstat (limited to 'intern/cycles/render/scene.cpp')
| -rw-r--r-- | intern/cycles/render/scene.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp index 98c256a43b5..b7720b7aa99 100644 --- a/intern/cycles/render/scene.cpp +++ b/intern/cycles/render/scene.cpp @@ -16,6 +16,7 @@ #include <stdlib.h> +#include "bvh/bvh.h" #include "device/device.h" #include "render/background.h" #include "render/bake.h" @@ -100,6 +101,7 @@ Scene::Scene(const SceneParams ¶ms_, Device *device) { memset((void *)&dscene.data, 0, sizeof(dscene.data)); + bvh = NULL; camera = create_node<Camera>(); dicing_camera = create_node<Camera>(); lookup_tables = new LookupTables(); @@ -135,6 +137,9 @@ Scene::~Scene() void Scene::free_memory(bool final) { + delete bvh; + bvh = NULL; + foreach (Shader *s, shaders) delete s; foreach (Geometry *g, geometry) |