diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-02-19 16:13:21 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-02-19 16:13:21 +0300 |
commit | 4755ab9f80df7ed52366b7928658e89c54fa15ac (patch) | |
tree | 5e4e18a28198e1def2263c4142dd0b48aa5df83a /source/blender/blenloader | |
parent | f09dc08523e5f5f995e8bb163ddd7e6b86f9cd60 (diff) |
scene_update_for_newframe was calling DAG_scene_update_flags() and BKE_animsys_evaluate_all_animation() for each set.
gain some speedup by only calling once.
minor printf changes to readfile.c, no functional change.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index f4112bde8da..61f101dee8c 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3436,6 +3436,7 @@ static void lib_link_object(FileData *fd, Main *main) if(ob->proxy->id.lib==NULL) { ob->proxy->proxy_from= NULL; ob->proxy= NULL; + printf("Proxy lost from object %s lib %s\n", ob->id.name+2, ob->id.lib->name); } else { /* this triggers object_update to always use a copy */ @@ -3450,11 +3451,14 @@ static void lib_link_object(FileData *fd, Main *main) ob->data= newlibadr_us(fd, ob->id.lib, ob->data); if(ob->data==NULL && poin!=NULL) { + if(ob->id.lib) + printf("Can't find obdata of %s lib %s\n", ob->id.name+2, ob->id.lib->name); + else + printf("Object %s lost data.\n", ob->id.name+2); + ob->type= OB_EMPTY; warn= 1; - if(ob->id.lib) printf("Can't find obdata of %s lib %s\n", ob->id.name+2, ob->id.lib->name); - else printf("Object %s lost data.\n", ob->id.name+2); - + if(ob->pose) { free_pose(ob->pose); ob->pose= NULL; |