Merge branch 'sdf12' into ahcorde/usd_to_sdf/fix_rigid_body

ahcorde · web-flow · commit 158cd8333dac · 2022-03-22T12:44:00.000+01:00
diff --git a/usd/src/usd_parser/USDPhysics.cc b/usd/src/usd_parser/USDPhysics.cc
@@ -60,6 +60,11 @@ namespace usd
       {
         magnitude = magnitude * _metersPerUnit;
       }
+      else
+      {
+        // Use the default value for the gravity if it's not defined.
+        magnitude = 9.8f;
+      }
     }
     _world.SetGravity(worldGravity * magnitude);
   }

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,11 @@ namespace usd`
`60`	`60`	`{`
`61`	`61`	`magnitude = magnitude * _metersPerUnit;`
`62`	`62`	`}`
	`63`	`+ else`
	`64`	`+ {`
	`65`	`+ // Use the default value for the gravity if it's not defined.`
	`66`	`+ magnitude = 9.8f;`
	`67`	`+ }`
`63`	`68`	`}`
`64`	`69`	`_world.SetGravity(worldGravity * magnitude);`
`65`	`70`	`}`