diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2010-06-28 15:07:02 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2010-06-28 15:07:02 +0400 |
| commit | 8517a7a3cd93532ef1ff53ccbf07e8fc14a5109e (patch) | |
| tree | d7280bdbe9ed6b57b05155f35d6b0e39a466d2d7 /source/blender/blenkernel/BKE_lattice.h | |
| parent | aae952be1fc0d3ff6955e8d542d5330e93e96ef7 (diff) | |
Fix #20965: metaballs partticles and volume material crash rendering
Fix #21187: 2.5svn26947 - particles + meta sphere = crash in rendering
Use separated displists for mballs in view3d and render stuff.
Do not recalculate displist for view3d while rendering - mball.c
uses several global variables which shouldn't be accepted from
parallel threads.
Diffstat (limited to 'source/blender/blenkernel/BKE_lattice.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_lattice.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_lattice.h b/source/blender/blenkernel/BKE_lattice.h index f35dff53cd5..880f3f7e724 100644 --- a/source/blender/blenkernel/BKE_lattice.h +++ b/source/blender/blenkernel/BKE_lattice.h @@ -49,7 +49,7 @@ void init_latt_deform(struct Object *oblatt, struct Object *ob); void calc_latt_deform(struct Object *, float *co, float weight); void end_latt_deform(struct Object *); -int object_deform_mball(struct Object *ob); +int object_deform_mball(struct Object *ob, struct ListBase *dispbase); void outside_lattice(struct Lattice *lt); void curve_deform_verts(struct Scene *scene, struct Object *cuOb, struct Object *target, |