Merge branch 'master' of ssh://git.breab.org:2223/kai/MasterTestProjekt

1b19ec99 · wester · 53668137 · 1515f134 · 1b19ec99 · 1b19ec99
Commit 1b19ec99 authored Aug 28, 2017 by wester
5 changed files
--- a/Content/DefaultVRMap.umap
+++ b/Content/DefaultVRMap.umap
--- a/Content/LaserBeam/Laser_PS.uasset
+++ b/Content/LaserBeam/Laser_PS.uasset
--- a/Content/VR_PAwn.uasset
+++ b/Content/VR_PAwn.uasset
--- a/MasterTestProject.uproject
+++ b/MasterTestProject.uproject
 {
 	"FileVersion": 3,
-	"EngineAssociation": "4.15",
+	"EngineAssociation": "4.17",
 	"Category": "",
 	"Description": "",
 	"Modules": [

--- a/Source/MasterTestProject/ue4-assimp/ProceduralEntity.h
+++ b/Source/MasterTestProject/ue4-assimp/ProceduralEntity.h
@@ -19,7 +19,7 @@ class  AProceduralEntity : public AActor
 	GENERATED_BODY()
 	
 public:
-	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Generation")
+	//UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Generation")
 	FTile tile;

 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Generation")