diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-12-02 17:33:22 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-12-02 17:33:51 +0300 |
| commit | 85f9d319a409f26a4ca29d780de6a529794dc13e (patch) | |
| tree | c309955833815ad8a805993a25c52b8cef101372 /source/blender/draw | |
| parent | 13c3ad7e766f8bc4eef432e2aa2e4d78d5f7eb83 (diff) | |
Fix T83293: crash when selecting bone
This partially reverts rBe922dd7d8a307c54d49bc01649a12610b022192b.
The issues fixed by that commit is still fixed.
Reviewers: fclem
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/engines/overlay/overlay_armature.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_armature.c b/source/blender/draw/engines/overlay/overlay_armature.c index 1f95eec4486..cbd2589f20f 100644 --- a/source/blender/draw/engines/overlay/overlay_armature.c +++ b/source/blender/draw/engines/overlay/overlay_armature.c @@ -1910,7 +1910,7 @@ static void draw_armature_edit(ArmatureDrawContext *ctx) edbo_compute_bbone_child(arm); - for (eBone = arm->edbo->first, index = ob->runtime.select_id; eBone; + for (eBone = arm->edbo->first, index = ob_orig->runtime.select_id; eBone; eBone = eBone->next, index += 0x10000) { if (eBone->layer & arm->layer) { if ((eBone->flag & BONE_HIDDEN_A) == 0) { @@ -2005,7 +2005,8 @@ static void draw_armature_pose(ArmatureDrawContext *ctx) DRW_state_is_select(); if (is_pose_select) { - index = ob->runtime.select_id; + const Object *ob_orig = DEG_get_original_object(ob); + index = ob_orig->runtime.select_id; } } |