From 360bdcb50e3060e43d6610372100bbc368d1e69a Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 16 Dec 2015 11:28:43 -0600 Subject: [PATCH 1/2] Optics - Don't modify camera for ThreeDen Editor Fix broken ThreeDen Camera when returning to editor from preview. PIP will still work in preview. Will have to take a look at 1.56 RC to see if command exists and eventually cleanup. --- addons/optics/XEH_postInit.sqf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/optics/XEH_postInit.sqf b/addons/optics/XEH_postInit.sqf index 6214178ac9..6b02a678a8 100644 --- a/addons/optics/XEH_postInit.sqf +++ b/addons/optics/XEH_postInit.sqf @@ -6,6 +6,12 @@ if (!hasInterface) exitWith {}; GVAR(camera) = objNull; 0 = 0 spawn { + // Workarround for the ThreeDen Editor Camera + //ToDo: verify if command will exist in 1.56 release + if (((productVersion select 2) >= 155) && {is3DEN}) exitWith { + ACE_LOGINFO("Eden detected: disabling Optics PIP Camera"); + }; + waituntil {!isNull ACE_player}; waituntil {sleep 1; {_x != GVAR(camera)} count allMissionObjects "camera" == 0 && {isNull curatorCamera}}; From 43a9865fa28842c36fb1e3ec8bc926c2579e5fa6 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 16 Dec 2015 12:10:53 -0600 Subject: [PATCH 2/2] Use isNil for better future compatiblity --- addons/optics/XEH_postInit.sqf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/optics/XEH_postInit.sqf b/addons/optics/XEH_postInit.sqf index 6b02a678a8..c00577e61e 100644 --- a/addons/optics/XEH_postInit.sqf +++ b/addons/optics/XEH_postInit.sqf @@ -7,8 +7,7 @@ GVAR(camera) = objNull; 0 = 0 spawn { // Workarround for the ThreeDen Editor Camera - //ToDo: verify if command will exist in 1.56 release - if (((productVersion select 2) >= 155) && {is3DEN}) exitWith { + if ((!isNil {is3DEN}) && {is3DEN}) exitWith { ACE_LOGINFO("Eden detected: disabling Optics PIP Camera"); };