diff options
-rw-r--r-- | source/blender/alembic/intern/abc_mesh.cc | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_cloth.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_dynamicpaint.h | 5 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_smoke.h | 7 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh_conv.c | 64 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_fluidsim_util.h | 2 |
6 files changed, 48 insertions, 44 deletions
diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc index 4c48b7a5bce..728b7ede21f 100644 --- a/source/blender/alembic/intern/abc_mesh.cc +++ b/source/blender/alembic/intern/abc_mesh.cc @@ -505,10 +505,10 @@ void AbcMeshWriter::writeSubD(struct Mesh *mesh) } template <typename Schema> -void AbcMeshWriter::writeFaceSets(struct Mesh *dm, Schema &schema) +void AbcMeshWriter::writeFaceSets(struct Mesh *me, Schema &schema) { std::map< std::string, std::vector<int32_t> > geo_groups; - getGeoGroups(dm, geo_groups); + getGeoGroups(me, geo_groups); std::map< std::string, std::vector<int32_t> >::iterator it; for (it = geo_groups.begin(); it != geo_groups.end(); ++it) { @@ -563,7 +563,7 @@ Mesh *AbcMeshWriter::getFinalMesh(bool &r_needsfree) return mesh; } -void AbcMeshWriter::writeArbGeoParams(struct Mesh *dm) +void AbcMeshWriter::writeArbGeoParams(struct Mesh *me) { if (m_is_liquid) { /* We don't need anything more for liquid meshes. */ @@ -572,10 +572,10 @@ void AbcMeshWriter::writeArbGeoParams(struct Mesh *dm) if (m_first_frame && m_settings.export_vcols) { if (m_subdiv_schema.valid()) { - write_custom_data(m_subdiv_schema.getArbGeomParams(), m_custom_data_config, &dm->ldata, CD_MLOOPCOL); + write_custom_data(m_subdiv_schema.getArbGeomParams(), m_custom_data_config, &me->ldata, CD_MLOOPCOL); } else { - write_custom_data(m_mesh_schema.getArbGeomParams(), m_custom_data_config, &dm->ldata, CD_MLOOPCOL); + write_custom_data(m_mesh_schema.getArbGeomParams(), m_custom_data_config, &me->ldata, CD_MLOOPCOL); } } } diff --git a/source/blender/blenkernel/BKE_cloth.h b/source/blender/blenkernel/BKE_cloth.h index d0a08060180..87094e77953 100644 --- a/source/blender/blenkernel/BKE_cloth.h +++ b/source/blender/blenkernel/BKE_cloth.h @@ -239,7 +239,9 @@ void cloth_free_contacts(ColliderContacts *collider_contacts, int totcolliders); void cloth_free_modifier_extern (struct ClothModifierData *clmd ); void cloth_free_modifier (struct ClothModifierData *clmd ); void cloth_init (struct ClothModifierData *clmd ); -void clothModifier_do(struct ClothModifierData *clmd, struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob, struct Mesh *dm, float (*vertexCos)[3]); +void clothModifier_do( + struct ClothModifierData *clmd, struct Depsgraph *depsgraph, struct Scene *scene, + struct Object *ob, struct Mesh *me, float (*vertexCos)[3]); int cloth_uses_vgroup(struct ClothModifierData *clmd); diff --git a/source/blender/blenkernel/BKE_dynamicpaint.h b/source/blender/blenkernel/BKE_dynamicpaint.h index f663e1b29bf..537a2946f36 100644 --- a/source/blender/blenkernel/BKE_dynamicpaint.h +++ b/source/blender/blenkernel/BKE_dynamicpaint.h @@ -65,8 +65,9 @@ typedef struct PaintWavePoint { short state; } PaintWavePoint; -struct Mesh *dynamicPaint_Modifier_do(struct DynamicPaintModifierData *pmd, struct Depsgraph *depsgraph, struct Scene *scene, - struct Object *ob, struct Mesh *dm); +struct Mesh *dynamicPaint_Modifier_do( + struct DynamicPaintModifierData *pmd, struct Depsgraph *depsgraph, struct Scene *scene, + struct Object *ob, struct Mesh *me); void dynamicPaint_Modifier_free(struct DynamicPaintModifierData *pmd); void dynamicPaint_Modifier_copy(const struct DynamicPaintModifierData *pmd, struct DynamicPaintModifierData *tsmd); diff --git a/source/blender/blenkernel/BKE_smoke.h b/source/blender/blenkernel/BKE_smoke.h index 8e800cea043..deee85c02d4 100644 --- a/source/blender/blenkernel/BKE_smoke.h +++ b/source/blender/blenkernel/BKE_smoke.h @@ -35,9 +35,10 @@ typedef float (*bresenham_callback)(float *result, float *input, int res[3], int *pixel, float *tRay, float correct); -struct Mesh *smokeModifier_do(struct SmokeModifierData *smd, struct Depsgraph *depsgraph, - struct Scene *scene, - struct Object *ob, struct Mesh *dm); +struct Mesh *smokeModifier_do( + struct SmokeModifierData *smd, struct Depsgraph *depsgraph, + struct Scene *scene, + struct Object *ob, struct Mesh *me); void smoke_reallocate_fluid(struct SmokeDomainSettings *sds, float dx, int res[3], int free_old); void smoke_reallocate_highres_fluid(struct SmokeDomainSettings *sds, float dx, int res[3], int free_old); diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c index 0beeffceae5..ef5864ba220 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_conv.c +++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c @@ -964,37 +964,37 @@ void BM_mesh_bm_to_me( * * \note Was `cddm_from_bmesh_ex` in 2.7x, removed `MFace` support. */ -void BM_mesh_bm_to_me_for_eval(BMesh *bm, Mesh *dm, const int64_t cd_mask_extra) +void BM_mesh_bm_to_me_for_eval(BMesh *bm, Mesh *me, const int64_t cd_mask_extra) { /* must be an empty mesh. */ - BLI_assert(dm->totvert == 0); + BLI_assert(me->totvert == 0); BLI_assert((cd_mask_extra & CD_MASK_SHAPEKEY) == 0); - dm->totvert = bm->totvert; - dm->totedge = bm->totedge; - dm->totface = 0; - dm->totloop = bm->totloop; - dm->totpoly = bm->totface; + me->totvert = bm->totvert; + me->totedge = bm->totedge; + me->totface = 0; + me->totloop = bm->totloop; + me->totpoly = bm->totface; - CustomData_add_layer(&dm->vdata, CD_ORIGINDEX, CD_CALLOC, NULL, bm->totvert); - CustomData_add_layer(&dm->edata, CD_ORIGINDEX, CD_CALLOC, NULL, bm->totedge); - CustomData_add_layer(&dm->pdata, CD_ORIGINDEX, CD_CALLOC, NULL, bm->totface); + CustomData_add_layer(&me->vdata, CD_ORIGINDEX, CD_CALLOC, NULL, bm->totvert); + CustomData_add_layer(&me->edata, CD_ORIGINDEX, CD_CALLOC, NULL, bm->totedge); + CustomData_add_layer(&me->pdata, CD_ORIGINDEX, CD_CALLOC, NULL, bm->totface); - CustomData_add_layer(&dm->vdata, CD_MVERT, CD_CALLOC, NULL, bm->totvert); - CustomData_add_layer(&dm->edata, CD_MEDGE, CD_CALLOC, NULL, bm->totedge); - CustomData_add_layer(&dm->ldata, CD_MLOOP, CD_CALLOC, NULL, bm->totloop); - CustomData_add_layer(&dm->pdata, CD_MPOLY, CD_CALLOC, NULL, bm->totface); + CustomData_add_layer(&me->vdata, CD_MVERT, CD_CALLOC, NULL, bm->totvert); + CustomData_add_layer(&me->edata, CD_MEDGE, CD_CALLOC, NULL, bm->totedge); + CustomData_add_layer(&me->ldata, CD_MLOOP, CD_CALLOC, NULL, bm->totloop); + CustomData_add_layer(&me->pdata, CD_MPOLY, CD_CALLOC, NULL, bm->totface); - BKE_mesh_update_customdata_pointers(dm, false); + BKE_mesh_update_customdata_pointers(me, false); BMIter iter; BMVert *eve; BMEdge *eed; BMFace *efa; - MVert *mvert = dm->mvert; - MEdge *medge = dm->medge; - MLoop *mloop = dm->mloop; - MPoly *mpoly = dm->mpoly; + MVert *mvert = me->mvert; + MEdge *medge = me->medge; + MLoop *mloop = me->mloop; + MPoly *mpoly = me->mpoly; int *index, add_orig; unsigned int i, j; @@ -1002,7 +1002,7 @@ void BM_mesh_bm_to_me_for_eval(BMesh *bm, Mesh *dm, const int64_t cd_mask_extra) const int cd_edge_bweight_offset = CustomData_get_offset(&bm->edata, CD_BWEIGHT); const int cd_edge_crease_offset = CustomData_get_offset(&bm->edata, CD_CREASE); - dm->runtime.deformed_only = true; + me->runtime.deformed_only = true; /* don't add origindex layer if one already exists */ add_orig = !CustomData_has_layer(&bm->pdata, CD_ORIGINDEX); @@ -1010,12 +1010,12 @@ void BM_mesh_bm_to_me_for_eval(BMesh *bm, Mesh *dm, const int64_t cd_mask_extra) /* don't process shapekeys, we only feed them through the modifier stack as needed, * e.g. for applying modifiers or the like*/ const CustomDataMask mask = (CD_MASK_DERIVEDMESH | cd_mask_extra) & ~CD_MASK_SHAPEKEY; - CustomData_merge(&bm->vdata, &dm->vdata, mask, CD_CALLOC, dm->totvert); - CustomData_merge(&bm->edata, &dm->edata, mask, CD_CALLOC, dm->totedge); - CustomData_merge(&bm->ldata, &dm->ldata, mask, CD_CALLOC, dm->totloop); - CustomData_merge(&bm->pdata, &dm->pdata, mask, CD_CALLOC, dm->totpoly); + CustomData_merge(&bm->vdata, &me->vdata, mask, CD_CALLOC, me->totvert); + CustomData_merge(&bm->edata, &me->edata, mask, CD_CALLOC, me->totedge); + CustomData_merge(&bm->ldata, &me->ldata, mask, CD_CALLOC, me->totloop); + CustomData_merge(&bm->pdata, &me->pdata, mask, CD_CALLOC, me->totpoly); - index = CustomData_get_layer(&dm->vdata, CD_ORIGINDEX); + index = CustomData_get_layer(&me->vdata, CD_ORIGINDEX); BM_ITER_MESH_INDEX (eve, &iter, bm, BM_VERTS_OF_MESH, i) { MVert *mv = &mvert[i]; @@ -1032,11 +1032,11 @@ void BM_mesh_bm_to_me_for_eval(BMesh *bm, Mesh *dm, const int64_t cd_mask_extra) if (add_orig) *index++ = i; - CustomData_from_bmesh_block(&bm->vdata, &dm->vdata, eve->head.data, i); + CustomData_from_bmesh_block(&bm->vdata, &me->vdata, eve->head.data, i); } bm->elem_index_dirty &= ~BM_VERT; - index = CustomData_get_layer(&dm->edata, CD_ORIGINDEX); + index = CustomData_get_layer(&me->edata, CD_ORIGINDEX); BM_ITER_MESH_INDEX (eed, &iter, bm, BM_EDGES_OF_MESH, i) { MEdge *med = &medge[i]; @@ -1058,12 +1058,12 @@ void BM_mesh_bm_to_me_for_eval(BMesh *bm, Mesh *dm, const int64_t cd_mask_extra) if (cd_edge_crease_offset != -1) med->crease = BM_ELEM_CD_GET_FLOAT_AS_UCHAR(eed, cd_edge_crease_offset); if (cd_edge_bweight_offset != -1) med->bweight = BM_ELEM_CD_GET_FLOAT_AS_UCHAR(eed, cd_edge_bweight_offset); - CustomData_from_bmesh_block(&bm->edata, &dm->edata, eed->head.data, i); + CustomData_from_bmesh_block(&bm->edata, &me->edata, eed->head.data, i); if (add_orig) *index++ = i; } bm->elem_index_dirty &= ~BM_EDGE; - index = CustomData_get_layer(&dm->pdata, CD_ORIGINDEX); + index = CustomData_get_layer(&me->pdata, CD_ORIGINDEX); j = 0; BM_ITER_MESH_INDEX (efa, &iter, bm, BM_FACES_OF_MESH, i) { BMLoop *l_iter; @@ -1081,7 +1081,7 @@ void BM_mesh_bm_to_me_for_eval(BMesh *bm, Mesh *dm, const int64_t cd_mask_extra) do { mloop->v = BM_elem_index_get(l_iter->v); mloop->e = BM_elem_index_get(l_iter->e); - CustomData_from_bmesh_block(&bm->ldata, &dm->ldata, l_iter->head.data, j); + CustomData_from_bmesh_block(&bm->ldata, &me->ldata, l_iter->head.data, j); BM_elem_index_set(l_iter, j); /* set_inline */ @@ -1089,11 +1089,11 @@ void BM_mesh_bm_to_me_for_eval(BMesh *bm, Mesh *dm, const int64_t cd_mask_extra) mloop++; } while ((l_iter = l_iter->next) != l_first); - CustomData_from_bmesh_block(&bm->pdata, &dm->pdata, efa->head.data, i); + CustomData_from_bmesh_block(&bm->pdata, &me->pdata, efa->head.data, i); if (add_orig) *index++ = i; } bm->elem_index_dirty &= ~(BM_FACE | BM_LOOP); - dm->cd_flag = BM_mesh_cd_flag_from_bmesh(bm); + me->cd_flag = BM_mesh_cd_flag_from_bmesh(bm); } diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.h b/source/blender/modifiers/intern/MOD_fluidsim_util.h index 041a67eddbd..4bb745fbd66 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim_util.h +++ b/source/blender/modifiers/intern/MOD_fluidsim_util.h @@ -46,6 +46,6 @@ void fluidsim_free(struct FluidsimModifierData *fluidmd); struct Mesh *fluidsimModifier_do( struct FluidsimModifierData *fluidmd, const struct ModifierEvalContext *ctx, - struct Mesh *dm); + struct Mesh *me); #endif |