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:
authorNathan Letwory <nathan@mcneel.com>2014-05-16 17:43:28 +0400
committerNathan Letwory <nathan@mcneel.com>2014-05-19 15:46:57 +0400
commit9a7c4ead3f57052c911570d1b507e1f5229210c8 (patch)
tree7477e4947f2a49d74e7601887f58f64ddaf364e4 /intern/cycles/util/util_types.h
parent74f77a295649b7f42ede5072c5642fd02d67c5dd (diff)
Move BVHType and shadingsystem enums to top-level of Cycles namespace.
Easier access of BVHType and deduplication for ShadingSystem. Reviewers: dingto, brecht Differential Revision: https://developer.blender.org/D534
Diffstat (limited to 'intern/cycles/util/util_types.h')
-rw-r--r--intern/cycles/util/util_types.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h
index bfaab3dba3b..d1c9dc8398e 100644
--- a/intern/cycles/util/util_types.h
+++ b/intern/cycles/util/util_types.h
@@ -456,6 +456,15 @@ enum InterpolationType {
INTERPOLATION_SMART = 3,
};
+enum ShadingSystem {
+ OSL,
+ SVM
+};
+
+enum BVHType {
+ BVH_DYNAMIC,
+ BVH_STATIC
+};
/* macros */