diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-02-23 05:33:47 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-02-23 05:33:47 +0400 |
| commit | 9ef5d2d90598ce97b8ec773bb00f97825dbe0e1b (patch) | |
| tree | b6bc577ceffd147ad6b09f8251627c10fa309497 /source/blender/blenloader | |
| parent | c00191dbe3cbc3667948b7108068d4c8984f6d3c (diff) | |
fix for error in the blenderplayer caused by r54727 (can't assume G.main is valid on load).
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 9b896c12d10..4bae406fd09 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2712,7 +2712,7 @@ static void direct_link_constraints(FileData *fd, ListBase *lb) } } -static void lib_link_pose(FileData *fd, Object *ob, bPose *pose) +static void lib_link_pose(FileData *fd, Main *bmain, Object *ob, bPose *pose) { bPoseChannel *pchan; bArmature *arm = ob->data; @@ -2756,7 +2756,7 @@ static void lib_link_pose(FileData *fd, Object *ob, bPose *pose) } if (rebuild) { - DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); + DAG_id_tag_update_ex(bmain, &ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); pose->flag |= POSE_RECALC; } } @@ -4221,7 +4221,7 @@ static void lib_link_object(FileData *fd, Main *main) /* if id.us==0 a new base will be created later on */ /* WARNING! Also check expand_object(), should reflect the stuff below. */ - lib_link_pose(fd, ob, ob->pose); + lib_link_pose(fd, main, ob, ob->pose); lib_link_constraints(fd, &ob->id, &ob->constraints); // XXX deprecated - old animation system <<< |