Commit: 3569fdb745fd66d665ac3029d64effd9f3022b17
Author: Campbell Barton
Date: Sat Jul 13 00:14:14 2019 +1000
Branches: master
https://developer.blender.org/rB3569fdb745fd66d665ac3029d64effd9f3022b17
Cleanup: use `_orig` as a suffix
===================================================================
M source/blender/draw/intern/draw_armature.c
===================================================================
diff --git a/source/blender/draw/intern/draw_armature.c
b/source/blender/draw/intern/draw_armature.c
index b31ce22ebe9..c0673afd0d1 100644
--- a/source/blender/draw/intern/draw_armature.c
+++ b/source/blender/draw/intern/draw_armature.c
@@ -1896,9 +1896,9 @@ static void draw_armature_edit(Object *ob)
const bool show_text = DRW_state_show_text();
const bool show_relations = ((draw_ctx->v3d->flag & V3D_HIDE_HELPLINES) ==
0);
- const Object *orig_object = DEG_get_original_object(ob);
+ const Object *ob_orig = DEG_get_original_object(ob);
- for (eBone = arm->edbo->first, index = orig_object->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) {
@@ -1993,8 +1993,8 @@ static void draw_armature_pose(Object *ob, const float
const_color[4])
}
if (arm->flag & ARM_POSEMODE) {
- const Object *orig_object = DEG_get_original_object(ob);
- index = orig_object->runtime.select_id;
+ const Object *ob_orig = DEG_get_original_object(ob);
+ index = ob_orig->runtime.select_id;
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
