diff options
| -rw-r--r-- | source/blender/blenkernel/intern/displist.c | 6 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/effect.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 89183656bcc..f105b0ead17 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -1643,10 +1643,10 @@ void makeDispList(Object *ob) tex_space_mesh(ob->data); object_deform(ob); - + if(ob->effect.first) object_wave(ob); - if (mesh_uses_displist(me)) { + if (mesh_uses_displist(me)) { /* subsurf */ DispListMesh *dlm; if (ob==G.obedit) { @@ -2247,7 +2247,7 @@ void test_all_displists(void) else if(ob->type==OB_MESH) { if(ob->effect.first) object_wave(ob); if(ob!=G.obedit) { - if( ((Mesh *)(ob->data))->key ) makeDispList(ob); + if(( ((Mesh *)(ob->data))->key )||(ob->effect.first)) makeDispList(ob); } } diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index db9cfaf9b9d..5e04dd1eee4 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -832,7 +832,7 @@ void object_wave(Object *ob) if(dl->verts) MEM_freeN(dl->verts); dl->nr= me->totvert; - dl->verts= MEM_mallocN(3*4*me->totvert, "wave"); + dl->verts= MEM_mallocN(3*sizeof(float)*me->totvert, "wave"); wav= ob->effect.first; while(wav) { |