Changeset View
Changeset View
Standalone View
Standalone View
source/blender/blenkernel/intern/crazyspace.c
| Show First 20 Lines • Show All 267 Lines • ▼ Show 20 Lines | for (i = 0; md && i <= cageIndex; i++, md = md->next) { | ||||
| const ModifierTypeInfo *mti = modifierType_getInfo(md->type); | const ModifierTypeInfo *mti = modifierType_getInfo(md->type); | ||||
| if (!editbmesh_modifier_is_enabled(scene, md, me != NULL)) | if (!editbmesh_modifier_is_enabled(scene, md, me != NULL)) | ||||
| continue; | continue; | ||||
| if (mti->type == eModifierTypeType_OnlyDeform && mti->deformMatricesEM) { | if (mti->type == eModifierTypeType_OnlyDeform && mti->deformMatricesEM) { | ||||
| if (!defmats) { | if (!defmats) { | ||||
| const int required_mode = eModifierMode_Realtime | eModifierMode_Editmode; | const int required_mode = eModifierMode_Realtime | eModifierMode_Editmode; | ||||
| CustomDataMask data_mask = CD_MASK_BAREMESH; | CustomData_Masks data_mask = CD_MASK_BAREMESH; | ||||
| CDMaskLink *datamasks = modifiers_calcDataMasks(scene, ob, md, data_mask, required_mode, NULL, 0); | CDMaskLink *datamasks = modifiers_calcDataMasks(scene, ob, md, &data_mask, required_mode, NULL, NULL); | ||||
| data_mask = datamasks->mask; | data_mask = datamasks->mask; | ||||
| BLI_linklist_free((LinkNode *)datamasks, NULL); | BLI_linklist_free((LinkNode *)datamasks, NULL); | ||||
| me = BKE_mesh_from_editmesh_with_coords_thin_wrap(em, data_mask, NULL); | me = BKE_mesh_from_editmesh_with_coords_thin_wrap(em, &data_mask, NULL); | ||||
| deformedVerts = editbmesh_get_vertex_cos(em, &numVerts); | deformedVerts = editbmesh_get_vertex_cos(em, &numVerts); | ||||
| defmats = MEM_mallocN(sizeof(*defmats) * numVerts, "defmats"); | defmats = MEM_mallocN(sizeof(*defmats) * numVerts, "defmats"); | ||||
| for (a = 0; a < numVerts; a++) | for (a = 0; a < numVerts; a++) | ||||
| unit_m3(defmats[a]); | unit_m3(defmats[a]); | ||||
| } | } | ||||
| mti->deformMatricesEM(md, &mectx, em, me, deformedVerts, defmats, numVerts); | mti->deformMatricesEM(md, &mectx, em, me, deformedVerts, defmats, numVerts); | ||||
| } | } | ||||
| ▲ Show 20 Lines • Show All 148 Lines • Show Last 20 Lines | |||||