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>2018-01-25 17:38:46 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-02-03 14:20:58 +0300
commitbb6f1d159acc0fa8f5df838e6d9bbff425781a9d (patch)
tree927c3cb349621aa97a30ccb2d64a33ae9d2e4a0f /intern/cycles/render
parentf9ea097a872290d20cd94504adb3172165cb770d (diff)
Cycles: make displacement a supported feature.
Adaptive subdivision remains experimental, still needs more work.
Diffstat (limited to 'intern/cycles/render')
-rw-r--r--intern/cycles/render/shader.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index 51b7f76b9d5..a1ebb26eba3 100644
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@ -625,7 +625,7 @@ void ShaderManager::get_requested_features(Scene *scene,
ShaderNode *output_node = shader->graph->output();
if(output_node->input("Displacement")->link != NULL) {
requested_features->nodes_features |= NODE_FEATURE_BUMP;
- if(shader->displacement_method == DISPLACE_BOTH && requested_features->experimental) {
+ if(shader->displacement_method == DISPLACE_BOTH) {
requested_features->nodes_features |= NODE_FEATURE_BUMP_STATE;
}
}