Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky

# Conflicts:
#	Content/Maps/Interiors/GP13/S01/Interior/GP13_S01_A12_F08-09.umap

Binaries/Win64/IvazowskyEditor.target

@@ -4153,6 +4153,18 @@
 			"Path": "$(ProjectDir)/Plugins/EasyXMLParser/Binaries/Win64/UnrealEditor.modules",
 			"Type": "RequiredResource"
 		},
+		{
+			"Path": "$(ProjectDir)/Plugins/ElgBlueprintLibrary/Binaries/Win64/UnrealEditor-ElgBlueprintLibrary.dll",
+			"Type": "DynamicLibrary"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/ElgBlueprintLibrary/Binaries/Win64/UnrealEditor-ElgBlueprintLibrary.pdb",
+			"Type": "SymbolFile"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/ElgBlueprintLibrary/Binaries/Win64/UnrealEditor.modules",
+			"Type": "RequiredResource"
+		},
 		{
 			"Path": "$(ProjectDir)/Plugins/JPrinter/Binaries/Win64/UnrealEditor-JPrinter.dll",
 			"Type": "DynamicLibrary"
@@ -24531,6 +24543,10 @@
 			"Path": "$(ProjectDir)/Plugins/EasyXMLParser/EasyXMLParser.uplugin",
 			"Type": "UFS"
 		},
+		{
+			"Path": "$(ProjectDir)/Plugins/ElgBlueprintLibrary/ElgBlueprintLibrary.uplugin",
+			"Type": "UFS"
+		},
 		{
 			"Path": "$(ProjectDir)/Plugins/JPrinter/JPrinter.uplugin",
 			"Type": "UFS"

Source/GraffModule/Private/cppGI.cpp

@@ -60,7 +60,7 @@ TArray<ULevelStreaming*> UcppGI::cppLvlManage(UObject* WorldContextObject, Fcppc
 						(
 							(ceq[0] || !is3DTour || lvl.coords.flat == -1) && ceq[5]
 							)
-						|| (is3DTour ? lvl.anotherLvl >= 1 && lvl.anotherLvl == crd.flat : lvl.anotherLvl >= 1 && lvl.anotherLvl == crd.flat && lvl.coords.floor < crd.floor)
+						|| (is3DTour ? lvl.anotherLvl >= 1 && lvl.anotherLvl == crd.flat : lvl.anotherLvl >= 1 && lvl.coords.floor < crd.floor)
 						)
 					&& ceq[3] && ceq[4] && ceq[2]
 					) loadthis = true; //load all on floor and under 2-floor flat, and full 2-floor flat in 3d tour