Merge remote-tracking branch 'refs/remotes/origin/update'

getnamo · Sep 19, 2017 · eb15e81 · eb15e81
2 parents 0edeb0a + 984f81c
commit eb15e81
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/BLUI.uplugin b/BLUI.uplugin
@@ -1,30 +1,27 @@
 {
     "FileVersion": 3,
-
     "FriendlyName": "BLUI",
     "Version": 3,
-    "VersionName": "3.1.1",
-    "EngineVersion": "4.9+",
+    "VersionName": "3.2",
     "Description": "Chrome powered HTML UI and HUD for Unreal Engine 4",
     "Category": "UI",
     "CreatedBy": "Aaron M. Shea",
     "CreatedByURL": "http://aaronshea.me",
+  	"EnabledByDefault" : true,
     "CanContainContent": "true",
-
     "Modules": 
     [
         {
             "Name" : "BluLoader",
             "Type" : "Runtime",
             "LoadingPhase" : "PreDefault",
-			"BlacklistPlatforms" : [ "HTML5", "Android", "iOS"]
+			      "BlacklistPlatforms" : [ "HTML5", "Android", "iOS"]
         },
         {
             "Name": "Blu",
             "Type": "Runtime",
             "LoadingPhase": "PreDefault",
             "BlacklistPlatforms": [ "HTML5", "Android", "iOS" ]
         }
-    ],
-	"CanContainContent" : true
+    ]
 }
diff --git a/Content/BluTickActor.uasset b/Content/BluTickActor.uasset
diff --git a/Source/Blu/Private/BluBluprintFunctionLibrary.cpp b/Source/Blu/Private/BluBluprintFunctionLibrary.cpp
@@ -11,7 +11,7 @@ UBluBlueprintFunctionLibrary::UBluBlueprintFunctionLibrary(const class FObjectIn
 UBluEye* UBluBlueprintFunctionLibrary::NewBluEye(UObject* WorldContextObject)
 {
 
-	UWorld* World = GEngine->GetWorldFromContextObject(WorldContextObject);
+	UWorld* World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
 	UBluEye* tempObject = Cast<UBluEye>(StaticConstructObject_Internal(UBluEye::StaticClass()));
 
 	return tempObject;