diff --git a/CMCMakeModule b/CMCMakeModule index e303fba2..17e263bf 160000 --- a/CMCMakeModule +++ b/CMCMakeModule @@ -1 +1 @@ -Subproject commit e303fba2280134d938b0cfae971db60d996bf249 +Subproject commit 17e263bf440f0b8b6834b454a4952d2f2a38ce3c diff --git a/CMCore b/CMCore index 8e471259..1bc9a625 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 8e471259d2ecfa9c9f293ac45a6e9e119ec31fc9 +Subproject commit 1bc9a625da6689e95a106e838b81dd82e2eb69e8 diff --git a/CMSceneGraph b/CMSceneGraph index 53f0c618..d79ee130 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 53f0c618567a0e85aca2de4e9e06e08f587c1f7e +Subproject commit d79ee130efcc4e4df9a5e0185e41908639490fe4 diff --git a/example/Gizmo/Gizmo3DMove.cpp b/example/Gizmo/Gizmo3DMove.cpp index 7a5dcefe..a329bf5b 100644 --- a/example/Gizmo/Gizmo3DMove.cpp +++ b/example/Gizmo/Gizmo3DMove.cpp @@ -87,9 +87,9 @@ bool InitGizmoMoveStaticMesh() { Transform tm; - constexpr const Vector3f one_scale(1); - constexpr const Vector3f plane_scale(2); - constexpr const Vector3f cylinder_scale(0.35f,0.35f,4.0f); + const Vector3f one_scale(1); + const Vector3f plane_scale(2); + const Vector3f cylinder_scale(0.35f,0.35f,4.0f); { tm.SetScale(cylinder_scale); diff --git a/example/Gizmo/Gizmo3DScale.cpp b/example/Gizmo/Gizmo3DScale.cpp index d33fb773..8bc86d9a 100644 --- a/example/Gizmo/Gizmo3DScale.cpp +++ b/example/Gizmo/Gizmo3DScale.cpp @@ -87,9 +87,9 @@ bool InitGizmoScaleStaticMesh() { Transform tm; - constexpr const Vector3f one_scale(2); - constexpr const Vector3f plane_scale(2); - constexpr const Vector3f cylinder_scale(0.35f,0.35f,4.0f); + const Vector3f one_scale(2); + const Vector3f plane_scale(2); + const Vector3f cylinder_scale(0.35f,0.35f,4.0f); { tm.SetScale(cylinder_scale);