Merge branch 'master' of github.com:GTAmodding/re3

2020-12-02 10:38:39 +01:00
parent fba657ff0c 4b9f1680a3
commit f576311814
18 changed files with 434 additions and 38 deletions
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@ -1576,8 +1576,10 @@ CCamera::CamControl(void)
 					switchByJumpCut = true;
 			}
 		}
+#ifdef GTA_SCENE_EDIT
 		if(CSceneEdit::m_bEditOn)
 			ReqMode = CCam::MODE_EDITOR;
+#endif

 		if((m_uiTransitionState == 0 || switchByJumpCut) && ReqMode != Cams[ActiveCam].Mode){
 			if(switchByJumpCut){