diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2016-08-02 12:13:58 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2016-08-07 21:15:20 +0300 |
| commit | a58fe05c05dfc2a5d63a3d1977bcb15f7778990f (patch) | |
| tree | 4da4ac22208668167228a7440901264e0f3f38fd /intern/cycles/render/mesh.h | |
| parent | dd1929754f3f5746dea5837425ac8e8768aef2d9 (diff) | |
Cycles microdisplacement: Move displacement options from mesh to material settings
Displacement is now a per material setting, which means old files will have to
be updated if they had used displacement. Cool side effect of this change is
material previews now show displacement.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D2140
Diffstat (limited to 'intern/cycles/render/mesh.h')
| -rw-r--r-- | intern/cycles/render/mesh.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/intern/cycles/render/mesh.h b/intern/cycles/render/mesh.h index 2436d6aa231..eff5c50e635 100644 --- a/intern/cycles/render/mesh.h +++ b/intern/cycles/render/mesh.h @@ -116,15 +116,6 @@ public: float crease; }; - /* Displacement */ - enum DisplacementMethod { - DISPLACE_BUMP = 0, - DISPLACE_TRUE = 1, - DISPLACE_BOTH = 2, - - DISPLACE_NUM_METHODS, - }; - enum SubdivisionType { SUBDIVISION_NONE, SUBDIVISION_LINEAR, @@ -174,7 +165,6 @@ public: bool transform_applied; bool transform_negative_scaled; Transform transform_normal; - DisplacementMethod displacement_method; PackedPatchTable *patch_table; @@ -245,6 +235,7 @@ public: void tag_update(Scene *scene, bool rebuild); bool has_motion_blur() const; + bool has_true_displacement() const; /* Check whether the mesh should have own BVH built separately. Briefly, * own BVH is needed for mesh, if: |