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:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-11-21 20:31:58 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-11-21 21:00:29 +0300
commitf547bf2f1013a86dc5a6646707256a174c2a1b47 (patch)
treefc04536a4cfb2398a355d333e0b16186805268ca /intern/cycles/device/device.h
parentc08727ebabae1d84c9d4e3096a61ef131177d4d5 (diff)
Cycles: Make requested features struct aware of subsurface BSDF
This way we'll be able to disable SSS for the scene-adaptive kernel.
Diffstat (limited to 'intern/cycles/device/device.h')
-rw-r--r--intern/cycles/device/device.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h
index 769fb3ccf9d..b956090a199 100644
--- a/intern/cycles/device/device.h
+++ b/intern/cycles/device/device.h
@@ -100,6 +100,9 @@ public:
/* Denotes whether baking functionality is needed. */
bool use_baking;
+ /* Use subsurface scattering materials. */
+ bool use_subsurface;
+
DeviceRequestedFeatures()
{
/* TODO(sergey): Find more meaningful defaults. */
@@ -111,6 +114,7 @@ public:
use_object_motion = false;
use_camera_motion = false;
use_baking = false;
+ use_subsurface = false;
}
bool modified(const DeviceRequestedFeatures& requested_features)
@@ -122,7 +126,8 @@ public:
use_hair == requested_features.use_hair &&
use_object_motion == requested_features.use_object_motion &&
use_camera_motion == requested_features.use_camera_motion &&
- use_baking == requested_features.use_baking);
+ use_baking == requested_features.use_baking &&
+ use_subsurface == requested_features.use_subsurface);
}
/* Convert the requested features structure to a build options,
@@ -151,6 +156,9 @@ public:
if(!use_baking) {
build_options += " -D__NO_BAKING__";
}
+ if(!use_subsurface) {
+ build_options += " -D__NO_SUBSURFACE__";
+ }
return build_options;
}
};