Merge branch 'master' into wip/runtime2

src/Runtime/res/DataModelMetadata/en-us/MetaData.xml was not merged,
as that is no longer in this repo. Changes to that need to be
merged manually in qt3d-runtime.

Some TODOs added to implement things in new renderer.

Change-Id: Ic0a974c8942a72ef7c117b543a39b6c81f608c1f

1 files changed, 2 insertions, 0 deletions

diff --git a/src/Authoring/Studio/MainFrm.h b/src/Authoring/Studio/MainFrm.h
index 2a20f779..d24d4560 100644
--- a/src/Authoring/Studio/MainFrm.h
+++ b/src/Authoring/Studio/MainFrm.h
@@ -200,6 +200,8 @@ public:
     void OnUpdateViewSlide();
     void OnViewTimeline();
     void OnUpdateViewTimeline();
+    void onViewSceneCamera();
+    void onUpdateViewSceneCamera();
 
     void OnEditCameraZoomExtent();
     void OnEditCameraPan();