diff options
| author | Rohan Rathi <rohanrathi08@gmail.com> | 2018-05-29 08:40:54 +0300 |
|---|---|---|
| committer | Rohan Rathi <rohanrathi08@gmail.com> | 2018-05-29 08:40:54 +0300 |
| commit | 842245ac55ceca67863cdad252d8959cefb789c5 (patch) | |
| tree | 3301dd7fc5324ccd8b2ceea0d389f7d55b413fa8 /source/blender/makesdna/DNA_modifier_types.h | |
| parent | 5d2d36b0686d7253f9d61c00a63d273aba17677a (diff) | |
| parent | 6946c413402c05a838e98a3823bf926df8cfe8d1 (diff) | |
Merge branch 'blender2.8' into soc-2018-bevel
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 989e0768fc1..1d7d1b34f6b 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -740,7 +740,7 @@ typedef struct ParticleSystemModifierData { struct ParticleSystem *psys; struct Mesh *mesh_final; /* Final Mesh - its topology may differ from orig mesh. */ - struct Mesh *mesh_deformed; /* Deformed-only Mesh - its topology is same as orig mesh one. */ + struct Mesh *mesh_original; /* Original mesh that particles are attached to. */ int totdmvert, totdmedge, totdmface; short flag, pad; } ParticleSystemModifierData; @@ -1615,6 +1615,7 @@ typedef struct SDefVert { typedef struct SurfaceDeformModifierData { ModifierData modifier; + struct Depsgraph *depsgraph; struct Object *target; /* bind target object */ SDefVert *verts; /* vertex bind data */ float falloff; |