Merge branch 'master' into use-CBA_fnc_execAfterNFrames

README.md

@@ -1,5 +1,6 @@
 <p align="center">
-    <img src="https://raw.githubusercontent.com/zen-mod/ZEN/master/extras/assets/logo/logo_zen_black.png" width="500">
+    <img src="https://github.com/zen-mod/ZEN/raw/master/extras/assets/logo/black/ZEN-Logo.png#gh-light-mode-only" width="512">
+    <img src="https://github.com/zen-mod/ZEN/raw/master/extras/assets/logo/white/ZEN-Logo.png#gh-dark-mode-only" width="512">
 </p>
 
 <p align="center">

addons/context_menu/functions/fnc_initDisplayCurator.sqf

@@ -82,17 +82,13 @@ if (GVAR(enabled) == 1) exitWith {
                     // Clear selected entities if waypoint placement can occur and restore next frame
                     // Using entities tree as an alternative to the lack of a command to set curator selected entities
                     if (_canPlaceWaypoints) then {
-                        private _ctrlEntities = findDisplay IDD_RSCDISPLAYCURATOR displayCtrl IDC_RSCDISPLAYCURATOR_ENTITIES;
-                        private _selection = tvSelection _ctrlEntities;
-                        _ctrlEntities tvSetCurSel [-1];
-
                         [{
-                            params ["_ctrlEntities", "_selection"];
+                            params ["_objects", "_groups", "_waypoints", "_markers"];
+
+                            setCuratorSelected (_objects + _groups + _waypoints + _markers);
+                        }, curatorSelected] call CBA_fnc_execNextFrame;
 
-                            {
-                                _ctrlEntities tvSetSelected [_x, true];
-                            } forEach _selection;
-                        }, [_ctrlEntities, _selection]] call CBA_fnc_execNextFrame;
+                        setCuratorSelected [];
                     };
                 };
             };

addons/main/script_mod.hpp

@@ -10,7 +10,7 @@
 #define VERSION_AR  MAJOR,MINOR,PATCHLVL,BUILD
 
 // MINIMAL required version for the Mod. Components can specify others..
-#define REQUIRED_VERSION 2.12
+#define REQUIRED_VERSION 2.14
 #define REQUIRED_CBA_VERSION {3,16,0}
 
 #ifdef COMPONENT_BEAUTIFIED