diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-08-14 18:05:54 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-08-15 16:40:08 +0300 |
| commit | 913b8396d971f258df70827274bcdf86dd894185 (patch) | |
| tree | 56b0a0f53752ed26da0ea1580a26bfe41490310d /source/blender/blenkernel/intern/subdiv.c | |
| parent | 5a89dfe06baa2ab96947bb6b5f6c63c4b864fab2 (diff) | |
Multires: Initial groundwork to hook up displacement to new Subdiv object
Adds a displacement support for OpenSubdiov based subsurf object implemented
as a callback which gives vector displacement in object space. Currently is
implemented to calculate displacement based on myltires displacement grids,
but we can support things in the future if needed.
Submitting to review to see if there is something obviously wrong in the
direction (old multires code was sharing same displacement code to both
calculate final displaced mesh and reshape an existing one, which is rather
confusing and probably can be done more cleanly?).
Reviewers: brecht
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D3604
Diffstat (limited to 'source/blender/blenkernel/intern/subdiv.c')
| -rw-r--r-- | source/blender/blenkernel/intern/subdiv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/subdiv.c b/source/blender/blenkernel/intern/subdiv.c index 4f630e8c38c..f847d62018a 100644 --- a/source/blender/blenkernel/intern/subdiv.c +++ b/source/blender/blenkernel/intern/subdiv.c @@ -90,6 +90,7 @@ Subdiv *BKE_subdiv_new_from_converter(const SubdivSettings *settings, subdiv->settings = *settings; subdiv->topology_refiner = osd_topology_refiner; subdiv->evaluator = NULL; + subdiv->displacement_evaluator = NULL; BKE_subdiv_stats_end(&stats, SUBDIV_STATS_TOPOLOGY_REFINER_CREATION_TIME); subdiv->stats = stats; return subdiv; @@ -116,5 +117,6 @@ void BKE_subdiv_free(Subdiv *subdiv) if (subdiv->topology_refiner != NULL) { openSubdiv_deleteTopologyRefiner(subdiv->topology_refiner); } + BKE_subdiv_displacement_detach(subdiv); MEM_freeN(subdiv); } |