From 33411a6004e38f73cd31f37083db030c29723d83 Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Fri, 19 Apr 2019 19:42:12 -0400
Subject: [PATCH] merge fix

Former-commit-id: 15da549d36774bb3713297d2b9f3799b1d7eb5f4
---
 voxygen/src/anim/character/mod.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/voxygen/src/anim/character/mod.rs b/voxygen/src/anim/character/mod.rs
index 4d442d416e..3d6e3e1dfc 100644
--- a/voxygen/src/anim/character/mod.rs
+++ b/voxygen/src/anim/character/mod.rs
@@ -20,10 +20,10 @@ const SCALE: f32 = 11.0;
 pub struct CharacterSkeleton {
     head: Bone,
     chest: Bone,
-    bl_foot: Bone,
-    br_foot: Bone,
-    r_hand: Bone,
+    belt: Bone,
+    shorts: Bone,
     l_hand: Bone,
+    r_hand: Bone,
     l_foot: Bone,
     r_foot: Bone,
     back: Bone,
@@ -34,10 +34,10 @@ impl CharacterSkeleton {
         Self {
             head: Bone::default(),
             chest: Bone::default(),
-            br_foot: Bone::default(),
-            bl_foot: Bone::default(),
-            r_hand: Bone::default(),
+            belt: Bone::default(),
+            shorts: Bone::default(),
             l_hand: Bone::default(),
+            r_hand: Bone::default(),
             l_foot: Bone::default(),
             r_foot: Bone::default(),
             back: Bone::default(),
@@ -52,10 +52,10 @@ impl Skeleton for CharacterSkeleton {
         [
             FigureBoneData::new(self.head.compute_base_matrix()),
             FigureBoneData::new(chest_mat),
-            FigureBoneData::new(self.bl_foot.compute_base_matrix()),
-            FigureBoneData::new(self.br_foot.compute_base_matrix()),
-            FigureBoneData::new(self.r_hand.compute_base_matrix()),
+            FigureBoneData::new(self.belt.compute_base_matrix()),
+            FigureBoneData::new(self.shorts.compute_base_matrix()),
             FigureBoneData::new(self.l_hand.compute_base_matrix()),
+            FigureBoneData::new(self.r_hand.compute_base_matrix()),
             FigureBoneData::new(self.l_foot.compute_base_matrix()),
             FigureBoneData::new(self.r_foot.compute_base_matrix()),
             FigureBoneData::new(chest_mat * self.back.compute_base_matrix()),