diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-02-05 17:32:36 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-02-05 17:32:36 +0300 |
| commit | ef555380bad44d6c3ac04bc99dbc07714781c3f8 (patch) | |
| tree | da8af3f77fa6fd73e59135d846f1e47ebc44b1a7 /source/blender/blenkernel/intern/subsurf_ccg.c | |
| parent | a9c3ddc617e9c40a17327df507cff765246b1b30 (diff) | |
| parent | 15ff730b9b1d99f7b11a69628d9489546986e145 (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/blenkernel/intern/customdata.c
source/blender/makesdna/DNA_customdata_types.h
Diffstat (limited to 'source/blender/blenkernel/intern/subsurf_ccg.c')
| -rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 1bc6609fe0a..c5a2e02f48d 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -3774,6 +3774,7 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss, ccgdm->dm.calcNormals = ccgDM_calcNormals; ccgdm->dm.calcLoopNormals = CDDM_calc_loop_normals; + ccgdm->dm.calcLoopNormalsSpaceArray = CDDM_calc_loop_normals_spacearr; ccgdm->dm.recalcTessellation = ccgDM_recalcTessellation; ccgdm->dm.getVertCos = ccgdm_getVertCos; |