diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-05-07 00:11:41 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-05-07 00:13:33 +0300 |
| commit | 4422b3f9199cdd13c162ebc16c9e1d1b18f76bae (patch) | |
| tree | e1126c08d85fc4ce51be98b132ce5832f2e227cd /intern/cycles/render/shader.cpp | |
| parent | 734d1aec3f93b8757533284330afc2ac651442bd (diff) | |
Some fixes for CUDA runtime compile:
* When Baking wasn't used we got an error.
* On top of Volume Nodes (NODES_FEATURE_VOLUME), we now also check if we need volume sampling code,
so we can disable that as well and save some further compilation time.
Diffstat (limited to 'intern/cycles/render/shader.cpp')
| -rw-r--r-- | intern/cycles/render/shader.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp index 797f31ce92d..c07c6a04d03 100644 --- a/intern/cycles/render/shader.cpp +++ b/intern/cycles/render/shader.cpp @@ -528,6 +528,10 @@ void ShaderManager::get_requested_features(Scene *scene, if(output_node->input("Displacement")->link != NULL) { requested_features->nodes_features |= NODE_FEATURE_BUMP; } + /* On top of volume nodes, also check if we need volume sampling because + * e.g. an Emission node would slip through the NODE_FEATURE_VOLUME check */ + if(shader->has_volume) + requested_features->use_volume |= true; } } |