Merge pull request #438 from umasteeringgroup/Feature-13

Feature 13

UMAProject/Assets/UMA/Content/Core/HumanFemale/DNA/HumanGirl/BonePoses/HumanMaleToBoyPose.asset

@@ -29,12 +29,12 @@ MonoBehaviour:
     hash: -1984349568
     position: {x: 0, y: 0.000000010688455, z: -0.0000000015730528}
     rotation: {x: -0.009562276, y: -0.002849184, z: -0.027160905, w: 0.9995812}
-    scale: {x: 0.88627464, y: 0.8862746, z: 0.8862747}
+    scale: {x: 1, y: 0.8862746, z: 0.8862747}
     category: 
   - bone: RightFoot
     hash: -1693174228
     position: {x: 0.000000059604645, y: 0.000000004184365, z: -0.0000000113767165}
-    rotation: {x: -0.020821743, y: -0.010970795, z: 0.029780041, w: 0.9992794}
+    rotation: {x: 0.01995789, y: 0.012473465, z: 0.043844704, w: -0.99876106}
     scale: {x: 1.1686273, y: 1.1686276, z: 1.1686276}
     category: 
   - bone: LowerBackBelly
@@ -83,7 +83,7 @@ MonoBehaviour:
     hash: 130111906
     position: {x: 0.000000044703484, y: 0.0000000028979859, z: 0.000000009268909}
     rotation: {x: 0.000133705, y: -0.00069823733, z: 0.000690623, w: 0.9999996}
-    scale: {x: 1.15, y: 1.4, z: 1.4}
+    scale: {x: 1.15, y: 1.3, z: 1.3}
     category: 
   - bone: LeftOuterBreast
     hash: 361754685
@@ -94,14 +94,14 @@ MonoBehaviour:
   - bone: LeftFoot
     hash: 1486391408
     position: {x: -0.00000017881393, y: -0.000000015373399, z: -0.000000020428422}
-    rotation: {x: 0.020822829, y: -0.010971131, z: -0.029779708, w: 0.9992795}
+    rotation: {x: -0.019958908, y: 0.012474221, z: -0.043844584, w: -0.998761}
     scale: {x: 1.1686275, y: 1.1686275, z: 1.1686279}
     category: 
   - bone: RightForeArm
     hash: 1918345642
     position: {x: -0.00000014901161, y: 0.0000000070995325, z: -4.556453e-10}
     rotation: {x: 0.009561386, y: -0.0028499747, z: 0.027162485, w: 0.9995813}
-    scale: {x: 0.8862746, y: 0.8862746, z: 0.8862746}
+    scale: {x: 1, y: 0.8862746, z: 0.8862746}
     category: 
   - bone: RightHand
     hash: 1979272496
@@ -161,13 +161,13 @@ MonoBehaviour:
     hash: -1471957022
     position: {x: 0, y: 0, z: 0}
     rotation: {x: 0, y: 0, z: 0, w: 1}
-    scale: {x: 1, y: 0.85, z: 0.9}
+    scale: {x: 1, y: 0.95, z: 0.95}
     category: 
   - bone: LowerBackBelly
     hash: -1421416706
     position: {x: 0, y: 0, z: 0}
     rotation: {x: 0, y: 0, z: 0, w: 1}
-    scale: {x: 1, y: 0.7, z: 0.4}
+    scale: {x: 1, y: 0.7, z: 0.7}
     category: 
   - bone: Neck
     hash: -2145158803
@@ -205,5 +205,23 @@ MonoBehaviour:
     rotation: {x: 0, y: 0, z: 0, w: 1}
     scale: {x: 1, y: 0.9, z: 0.9}
     category: 
+  - bone: Spine1Adjust
+    hash: 473121629
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+    scale: {x: 1, y: 0.87, z: 1}
+    category: 
+  - bone: LeftLegAdjust
+    hash: -861926788
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+    scale: {x: 1, y: 1.2, z: 1.2}
+    category: 
+  - bone: RightLegAdjust
+    hash: -1005160586
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+    scale: {x: 1, y: 1.2, z: 1.2}
+    category: 
   tweenPoses: []
   tweenWeights: []

UMAProject/Assets/UMA/Content/Core/HumanMale/Recipes/WardrobeRecipes/MaleSmoothSkin.asset

@@ -17,21 +17,17 @@ MonoBehaviour:
   recipeType: Wardrobe
   DisplayValue: Smooth
   compatibleRaces:
-  - HumanMale
-  - HumanMaleDCS
-  - HumanMaleLegacy
   - HumanMaleHighPoly
+  - HumanBoy
+  - HumanMale
   wardrobeRecipeThumbs:
-  - race: HumanMale
-    filename: 
-    thumb: {fileID: 0}
-  - race: HumanMaleDCS
+  - race: HumanMaleHighPoly
     filename: 
     thumb: {fileID: 0}
-  - race: HumanMaleLegacy
+  - race: HumanBoy
     filename: 
     thumb: {fileID: 0}
-  - race: HumanMaleHighPoly
+  - race: HumanMale
     filename: 
     thumb: {fileID: 0}
   wardrobeSlot: Complexion
@@ -43,8 +39,11 @@ MonoBehaviour:
   MeshHideAssets: []
   OverrideDNA:
     PreloadValues: []
+  disabled: 0
   recipeString: '{"version":3,"packedSlotDataList":[],"slotsV2":[],"slotsV3":[{"id":"MaleTorso","scale":100,"copyIdx":-1,"overlays":[{"id":"M_Bod
-    smooth","colorIdx":0,"rect":[0.0,0.0,0.0,0.0],"isTransformed":false,"scale":{"x":0.0,"y":0.0,"z":0.0},"rotation":0.0}],"Tags":["Torso"],"Races":[]}],"colors":[],"fColors":[{"name":"Skin","colors":[255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0],"ShaderParms":[]}],"sharedColorCount":1,"race":"","packedDna":[]}'
+    smooth","colorIdx":0,"rect":[0.0,0.0,0.0,0.0],"isTransformed":false,"scale":{"x":0.0,"y":0.0,"z":0.0},"rotation":0.0,"blendModes":[0,0,0,0,0],"Tags":[],"tiling":[false,false,false,false,false],"uvOverride":0}],"Tags":["Torso"],"Races":[],"blendShapeTarget":"","overSmoosh":0.0,"smooshDistance":0.0,"smooshInvertX":false,"smooshInvertY":false,"smooshInvertZ":false,"smooshInvertDist":false,"smooshTargetTag":"","smooshableTag":"","isSwapSlot":false,"swapTag":"","uvOverride":0,"isDisabled":false,"expandAlongNormal":0}],"colors":[],"fColors":[{"name":"Skin","colors":[255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0],"ShaderParms":[],"alwaysUpdate":false,"alwaysUpdateParms":false,"isBaseColor":false,"displayColor":-1}],"sharedColorCount":1,"race":"HumanMale","packedDna":[],"uvOverride":0}'
+  forceKeep: 0
+  labelLocalFiles: 0
   IncompatibleRecipes: []
   UserField: 
   replaces: Nothing

UMAProject/Assets/UMA/Content/Hair/HairMat.mat

@@ -8,16 +8,14 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: HairMat
-  m_Shader: {fileID: 4800000, guid: 56d67a32ad64ca74aab4edff17eaecb6, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords:
-  - _NORMALMAP
+  m_Shader: {fileID: 4800000, guid: def76a94c229c2a4dae4e0ec3bcd8cca, type: 3}
+  m_ValidKeywords: []
   m_InvalidKeywords:
   - EFFECT_BUMP
   - EFFECT_HUE_VARIATION
   - _ALPHABLEND_ON
   - _METALLICGLOSSMAP
+  - _NORMALMAP
   - _USEHALFLAMBERT_ON
   - _USEHASHING_OFF
   - _WINDQUALITY_NONE
@@ -28,7 +26,6 @@ Material:
   stringTagMap:
     Keep: Keep
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -366,7 +363,7 @@ Material:
     - _BlueColor1: {r: 1, g: 1, b: 1, a: 1}
     - _BlueColor2: {r: 1, g: 1, b: 1, a: 1}
     - _BlueColor3: {r: 1, g: 1, b: 1, a: 1}
-    - _Color: {r: 0.5660378, g: 0.30104628, b: 0.27233887, a: 1}
+    - _Color: {r: 0.4811321, g: 0.19601172, b: 0.15735134, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _GreenColor0: {r: 1, g: 1, b: 1, a: 1}
     - _GreenColor1: {r: 1, g: 1, b: 1, a: 1}