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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2010-01-06 15:05:46 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2010-01-06 15:05:46 +0300
commit83f677d9cfce4fe30d63d4b04ac07e2dea3accbe (patch)
tree3126e7358da5724a3602697b2ddcf27d53163c25 /source/blender/blenkernel/intern/subsurf_ccg.c
parent90fe04965b1d8f1ff8362a854763fe0f65beb70e (diff)
Fix #20519: shrinkwrap modifier doesnt work with subsurface modifier.
Fix #20516: subsurf modiefier+pressing add for smoke sims results in crash. Fix retopo not working correct on subsurf mesh. Various deforming modifiers were not correctly taking into account that a derivedmesh is not necessarily a CDDerivedMesh, made utility functions for this now.
Diffstat (limited to 'source/blender/blenkernel/intern/subsurf_ccg.c')
-rw-r--r--source/blender/blenkernel/intern/subsurf_ccg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 072a665e0e9..3997f83ed49 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -2227,7 +2227,8 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss,
MFace *mface = NULL;
FaceVertWeight *qweight, *tweight;
- DM_from_template(&ccgdm->dm, dm, ccgSubSurf_getNumFinalVerts(ss),
+ DM_from_template(&ccgdm->dm, dm, DM_TYPE_CCGDM,
+ ccgSubSurf_getNumFinalVerts(ss),
ccgSubSurf_getNumFinalEdges(ss),
ccgSubSurf_getNumFinalFaces(ss));