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/bvh/bvh_multi.cpp | |
parent | c5a17d5ea1ff786cb91cbcf3f12cd02f730c4143 (diff) | |
parent | e7b698327cd91b371ff4fd43d1c117637224fded (diff) |
Merge remote-tracking branch 'origin/master' into geometry-nodesgeometry-nodes
Diffstat (limited to 'intern/cycles/bvh/bvh_multi.cpp')
-rw-r--r-- | intern/cycles/bvh/bvh_multi.cpp | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/intern/cycles/bvh/bvh_multi.cpp b/intern/cycles/bvh/bvh_multi.cpp new file mode 100644 index 00000000000..a9e771f20f1 --- /dev/null +++ b/intern/cycles/bvh/bvh_multi.cpp @@ -0,0 +1,37 @@ +/* + * Copyright 2020, Blender Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "bvh/bvh_multi.h" + +#include "util/util_foreach.h" + +CCL_NAMESPACE_BEGIN + +BVHMulti::BVHMulti(const BVHParams ¶ms_, + const vector<Geometry *> &geometry_, + const vector<Object *> &objects_) + : BVH(params_, geometry_, objects_) +{ +} + +BVHMulti::~BVHMulti() +{ + foreach (BVH *bvh, sub_bvhs) { + delete bvh; + } +} + +CCL_NAMESPACE_END |