diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2016-12-01 12:29:46 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2016-12-01 12:29:46 +0300 |
| commit | ff2a74906a7b70625a4e941c6a805f7734491204 (patch) | |
| tree | 562f5ccdd9f4e377d20fe22eadca48201924b4b3 /source/blender/editors/space_view3d/drawarmature.c | |
| parent | 73c1c92c0e86ce1b5a8abeaa16be2bf2c259412b (diff) | |
| parent | 58877d6d082d82185ca611b704364168e5984bd7 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_view3d/drawarmature.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawarmature.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index b37a6740891..7ac176f82b1 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -2719,6 +2719,11 @@ bool draw_armature(Scene *scene, View3D *v3d, ARegion *ar, Base *base, else { /* Draw Pose */ if (ob->pose && ob->pose->chanbase.first) { + /* We can't safely draw non-updated pose, might contain NULL bone pointers... */ + if (ob->pose->flag & POSE_RECALC) { + BKE_pose_rebuild(ob, arm); + } + /* drawing posemode selection indices or colors only in these cases */ if (!(base->flag & OB_FROMDUPLI)) { if (G.f & G_PICKSEL) { |