Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2005-07-19 06:36:21 +0400
committerDaniel Dunbar <daniel@zuster.org>2005-07-19 06:36:21 +0400
commit09b527263951781290af8461476dcd9ed5394c37 (patch)
tree85435546528e215ebf92fb3e2053ee2280fca217 /source/blender/blenloader/intern/readfile.c
parent8962195f21bc7bb1b7ea70290fff93176c03eb9f (diff)
- split mesh_deform off from object_deform
- changed mesh_modifier, sbObjectStep, object_deform to take vertexCo argument instead of operating on mesh - fixed bug where a derived mesh would not be returned in editmode - removed object_wave, replaced by init_wave_deform and calc_wave_deform - moved cached DerivedMesh to Object, not Mesh... fixes heisenbugs with linked objects
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
-rw-r--r--source/blender/blenloader/intern/readfile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 0911ccc7312..564017e0de6 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2090,7 +2090,6 @@ static void direct_link_mesh(FileData *fd, Mesh *mesh)
mesh->oc= 0;
mesh->dface= NULL;
mesh->decimated= NULL;
- mesh->derived= NULL;
if (mesh->tface) {
TFace *tfaces= mesh->tface;
@@ -2371,6 +2370,7 @@ static void direct_link_object(FileData *fd, Object *ob)
ob->bb= NULL;
ob->derivedDeform= NULL;
+ ob->derivedFinal= NULL;
}
/* ************ READ SCENE ***************** */