Commit: 8c220c57f97ff5bdd6801f7f60e057217d597326
Author: Luca Rood
Date: Mon Jan 23 19:36:20 2017 -0200
Branches: surface-deform-modifier
https://developer.blender.org/rB8c220c57f97ff5bdd6801f7f60e057217d597326
Review: More cleanup...
===================================================================
M source/blender/blenloader/intern/writefile.c
M source/blender/modifiers/intern/MOD_surfacedeform.c
===================================================================
diff --git a/source/blender/blenloader/intern/writefile.c
b/source/blender/blenloader/intern/writefile.c
index 6066529951..4ed878264f 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1845,9 +1845,12 @@ static void write_modifiers(WriteData *wd, ListBase
*modbase)
if
(smd->verts[i].binds[j].mode == MOD_SDEF_MODE_CENTROID ||
smd->verts[i].binds[j].mode == MOD_SDEF_MODE_LOOPTRI)
+ {
writedata(wd,
DATA, sizeof(float) * 3, smd->verts[i].binds[j].vert_weights);
- else
+ }
+ else {
writedata(wd,
DATA, sizeof(float) * smd->verts[i].binds[j].numverts,
smd->verts[i].binds[j].vert_weights);
+ }
}
}
}
diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c
b/source/blender/modifiers/intern/MOD_surfacedeform.c
index 487af7d944..9362499ba6 100644
--- a/source/blender/modifiers/intern/MOD_surfacedeform.c
+++ b/source/blender/modifiers/intern/MOD_surfacedeform.c
@@ -28,7 +28,7 @@ typedef struct SDefEdgePolys {
typedef struct SDefBindCalcData {
BVHTreeFromMesh * const treeData;
- const SDefAdjacency * const * const vert_edges;
+ const SDefAdjacency ** const vert_edges;
const SDefEdgePolys * const edge_polys;
SDefVert * const bind_verts;
const MLoopTri * const looptri;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
