diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-02-24 17:12:40 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-02-24 17:15:52 +0400 |
| commit | 1130c53cdb24b68d1871a03bad59fad9e6418f29 (patch) | |
| tree | 0e299fee380152e7101e783d0240afead80a3d56 /source/blender/blenkernel/BKE_lattice.h | |
| parent | b5aef37c27f5fb2a4bb4227253f81d886ddd796c (diff) | |
Fix T38755: Crash when having cyclic dependency and curve deform
Issue was caused by undefined object update order and in some
cases NULL pointer will be de-referenced.
Added on-demand curve path calculation, just the same creepy call
of BKE_displist_make_curveTypes(). This violates DAG and might
end up in a difficult to troubleshoot race condition if there'll
be some issues with how dependencies are calculated in DAG, but
this is the easiest and safest way to solve the bug at this stage,
Diffstat (limited to 'source/blender/blenkernel/BKE_lattice.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_lattice.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_lattice.h b/source/blender/blenkernel/BKE_lattice.h index 29d3673e2f0..fc84ef1f0bd 100644 --- a/source/blender/blenkernel/BKE_lattice.h +++ b/source/blender/blenkernel/BKE_lattice.h @@ -59,10 +59,10 @@ void end_latt_deform(struct LatticeDeformData *lattice_deform_data); bool object_deform_mball(struct Object *ob, struct ListBase *dispbase); void outside_lattice(struct Lattice *lt); -void curve_deform_verts(struct Object *cuOb, struct Object *target, +void curve_deform_verts(struct Scene *scene, struct Object *cuOb, struct Object *target, struct DerivedMesh *dm, float (*vertexCos)[3], int numVerts, const char *vgroup, short defaxis); -void curve_deform_vector(struct Object *cuOb, struct Object *target, +void curve_deform_vector(struct Scene *scene, struct Object *cuOb, struct Object *target, float orco[3], float vec[3], float mat[3][3], int no_rot_axis); void lattice_deform_verts(struct Object *laOb, struct Object *target, |