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>2016-09-28 18:03:42 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-09-28 18:03:59 +0300
commite1bfb89da25e1e879d046144dfccb12e914c97c0 (patch)
tree85d3cc240019f2bc644b4759ce18f2705ef677bd /intern/cycles/kernel/closure/bsdf.h
parentc5d760292571a213bf7c6eaa4f818a7cea10390d (diff)
Cycles: Fix compilation error with minimal feature set
Diffstat (limited to 'intern/cycles/kernel/closure/bsdf.h')
-rw-r--r--intern/cycles/kernel/closure/bsdf.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/kernel/closure/bsdf.h b/intern/cycles/kernel/closure/bsdf.h
index 1e7fbdb5450..2ab92badc93 100644
--- a/intern/cycles/kernel/closure/bsdf.h
+++ b/intern/cycles/kernel/closure/bsdf.h
@@ -374,6 +374,8 @@ ccl_device bool bsdf_merge(ShaderClosure *a, ShaderClosure *b)
default:
return false;
}
+#else
+ return false;
#endif
}