diff options
author | Mai Lavelle <mai.lavelle@gmail.com> | 2016-07-17 02:56:45 +0300 |
---|---|---|
committer | Mai Lavelle <mai.lavelle@gmail.com> | 2016-07-29 10:37:55 +0300 |
commit | 66e2e2484c09d35d6fe9a6282c9722c4039ec25f (patch) | |
tree | 87805d9ba7363e5354a529bf0cba9b7bb2c1f318 /intern/cycles/render/mesh.h | |
parent | c96ae81160ad1a943fafaca44a7d5e97c2d7a0d7 (diff) |
Cycles microdisplacement: move subdivision options to subsurf modifier
Subdivision options can now be found in the subsurf modifier. The modifier must
be the last in the stack or the options will be unavailable. Catmull-Clark
subdivision is still unavailable and will fallback to linear subdivision instead
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D2109
Diffstat (limited to 'intern/cycles/render/mesh.h')
-rw-r--r-- | intern/cycles/render/mesh.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/intern/cycles/render/mesh.h b/intern/cycles/render/mesh.h index adb639201ce..c9ae9aab888 100644 --- a/intern/cycles/render/mesh.h +++ b/intern/cycles/render/mesh.h @@ -119,6 +119,14 @@ public: DISPLACE_NUM_METHODS, }; + enum SubdivisionType { + SUBDIVISION_NONE, + SUBDIVISION_LINEAR, + SUBDIVISION_CATMULL_CLARK, + }; + + SubdivisionType subdivision_type; + /* Mesh Data */ enum GeometryFlags { GEOMETRY_NONE = 0, |