Merge branch 'main' into dev

LaurieCheers-unity · web-flow · commit c72ad20f9105 · 2021-01-22T11:00:47.000-08:00
diff --git a/Runtime/UrdfComponents/UrdfRobot.cs b/Runtime/UrdfComponents/UrdfRobot.cs
@@ -23,7 +23,8 @@ public enum GeometryTypes { Box, Cylinder, Sphere, Mesh }
     public class UrdfRobot : MonoBehaviour
     {
         public string FilePath;
-        public ImportSettings.axisType choosenAxis;
+        public ImportSettings.axisType choosenAxis ;
+        [SerializeField]
         private ImportSettings.axisType currentOrientation = ImportSettings.axisType.yAxis;
         public List<CollisionIgnore> collisionExceptions;
 

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ public enum GeometryTypes { Box, Cylinder, Sphere, Mesh }`
`23`	`23`	`public class UrdfRobot : MonoBehaviour`
`24`	`24`	`{`
`25`	`25`	`public string FilePath;`
`26`		`- public ImportSettings.axisType choosenAxis;`
	`26`	`+ public ImportSettings.axisType choosenAxis ;`
	`27`	`+ [SerializeField]`
`27`	`28`	`private ImportSettings.axisType currentOrientation = ImportSettings.axisType.yAxis;`
`28`	`29`	`public List<CollisionIgnore> collisionExceptions;`
`29`	`30`