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:
authorCampbell Barton <ideasman42@gmail.com>2019-08-21 23:28:35 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-08-21 23:48:10 +0300
commit189aa32a3ac0e949275d16ffb19576a1306d1780 (patch)
treeff75826925b4b26f6b4aa8928fe3c5d3c799a98f /source/blender/modifiers/intern/MOD_correctivesmooth.c
parent4a2d1953f3ca3e1160a3ce767df15e481658bdf6 (diff)
Cleanup: vertex coordinate access, naming & minor changes
This also splits vertex access and allocation so it's possible to copy coordinates into an existing array without allocating it.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_correctivesmooth.c')
-rw-r--r--source/blender/modifiers/intern/MOD_correctivesmooth.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.c b/source/blender/modifiers/intern/MOD_correctivesmooth.c
index be1580f0d70..a234f468e45 100644
--- a/source/blender/modifiers/intern/MOD_correctivesmooth.c
+++ b/source/blender/modifiers/intern/MOD_correctivesmooth.c
@@ -635,12 +635,12 @@ static void correctivesmooth_modifier_do(ModifierData *md,
if (csmd->rest_source == MOD_CORRECTIVESMOOTH_RESTSOURCE_BIND) {
/* caller needs to do sanity check here */
csmd->bind_coords_num = numVerts;
- rest_coords = (const float(*)[3])csmd->bind_coords;
+ rest_coords = csmd->bind_coords;
}
else {
int me_numVerts;
- rest_coords = (const float(*)[3])((em) ? BKE_editmesh_vertexCos_get_orco(em, &me_numVerts) :
- BKE_mesh_vertexCos_get(ob->data, &me_numVerts));
+ rest_coords = em ? BKE_editmesh_vert_coords_alloc_orco(em, &me_numVerts) :
+ BKE_mesh_vert_coords_alloc(ob->data, &me_numVerts);
BLI_assert((unsigned int)me_numVerts == numVerts);
is_rest_coords_alloc = true;