diff options
Diffstat (limited to 'source/blender/draw/engines')
-rw-r--r-- | source/blender/draw/engines/overlay/overlay_armature.c | 5 | ||||
-rw-r--r-- | source/blender/draw/engines/overlay/overlay_extra.c | 3 | ||||
-rw-r--r-- | source/blender/draw/engines/overlay/overlay_metaball.c | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_armature.c b/source/blender/draw/engines/overlay/overlay_armature.c index cbd2589f20f..1f95eec4486 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_orig->runtime.select_id; eBone; + for (eBone = arm->edbo->first, index = ob->runtime.select_id; eBone; eBone = eBone->next, index += 0x10000) { if (eBone->layer & arm->layer) { if ((eBone->flag & BONE_HIDDEN_A) == 0) { @@ -2005,8 +2005,7 @@ static void draw_armature_pose(ArmatureDrawContext *ctx) DRW_state_is_select(); if (is_pose_select) { - const Object *ob_orig = DEG_get_original_object(ob); - index = ob_orig->runtime.select_id; + index = ob->runtime.select_id; } } diff --git a/source/blender/draw/engines/overlay/overlay_extra.c b/source/blender/draw/engines/overlay/overlay_extra.c index 4ca7ee42f8d..39f17581e0d 100644 --- a/source/blender/draw/engines/overlay/overlay_extra.c +++ b/source/blender/draw/engines/overlay/overlay_extra.c @@ -871,7 +871,6 @@ static void camera_view3d_reconstruction(OVERLAY_ExtraCallBuffers *cb, { const DRWContextState *draw_ctx = DRW_context_state_get(); const bool is_select = DRW_state_is_select(); - const Object *orig_camera_object = DEG_get_original_object(camera_object); MovieClip *clip = BKE_object_movieclip_get(scene, ob, false); if (clip == NULL) { @@ -945,7 +944,7 @@ static void camera_view3d_reconstruction(OVERLAY_ExtraCallBuffers *cb, } if (is_select) { - DRW_select_load_id(orig_camera_object->runtime.select_id | (track_index << 16)); + DRW_select_load_id(camera_object->runtime.select_id | (track_index << 16)); track_index++; } diff --git a/source/blender/draw/engines/overlay/overlay_metaball.c b/source/blender/draw/engines/overlay/overlay_metaball.c index c10c0a84247..f973c1eda8a 100644 --- a/source/blender/draw/engines/overlay/overlay_metaball.c +++ b/source/blender/draw/engines/overlay/overlay_metaball.c @@ -82,8 +82,7 @@ void OVERLAY_edit_metaball_cache_populate(OVERLAY_Data *vedata, Object *ob) int select_id = 0; if (is_select) { - const Object *orig_object = DEG_get_original_object(ob); - select_id = orig_object->runtime.select_id; + select_id = ob->runtime.select_id; } LISTBASE_FOREACH (MetaElem *, ml, mb->editelems) { |