Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2017-08-21 16:09:03 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2017-08-21 20:05:17 +0300
commit296d74c4b11aafbeec84ee21c0feb5dc93590a3f (patch)
tree492b52f90b657565cdc35034a5e8d643a3c6f2d6 /intern/cycles/util
parent81a76469ca05a47a7471f92be3e0e257107de141 (diff)
Cycles: reorganize Performance panel layout, move viewport BVH type to debug.
Diffstat (limited to 'intern/cycles/util')
-rw-r--r--intern/cycles/util/util_debug.cpp3
-rw-r--r--intern/cycles/util/util_debug.h3
2 files changed, 6 insertions, 0 deletions
diff --git a/intern/cycles/util/util_debug.cpp b/intern/cycles/util/util_debug.cpp
index 10895f2e918..eb078d69252 100644
--- a/intern/cycles/util/util_debug.cpp
+++ b/intern/cycles/util/util_debug.cpp
@@ -122,13 +122,16 @@ void DebugFlags::OpenCL::reset()
}
DebugFlags::DebugFlags()
+: viewport_static_bvh(false)
{
/* Nothing for now. */
}
void DebugFlags::reset()
{
+ viewport_static_bvh = false;
cpu.reset();
+ cuda.reset();
opencl.reset();
}
diff --git a/intern/cycles/util/util_debug.h b/intern/cycles/util/util_debug.h
index 450cd900a9f..9255279c5ab 100644
--- a/intern/cycles/util/util_debug.h
+++ b/intern/cycles/util/util_debug.h
@@ -30,6 +30,9 @@ CCL_NAMESPACE_BEGIN
*/
class DebugFlags {
public:
+ /* Use static BVH in viewport, to match final render exactly. */
+ bool viewport_static_bvh;
+
/* Descriptor of CPU feature-set to be used. */
struct CPU {
CPU();