From e6edb3bd29ae134b676fab2468816cdedd317b39 Mon Sep 17 00:00:00 2001 From: Unktomi Date: Mon, 22 Aug 2016 05:01:57 +0100 Subject: [PATCH 1/3] fix 4.13 regression --- Source/VaRestEditorPlugin/Private/VaRest_BreakJson.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Source/VaRestEditorPlugin/Private/VaRest_BreakJson.cpp b/Source/VaRestEditorPlugin/Private/VaRest_BreakJson.cpp index 66cfeaaf..a7567f82 100644 --- a/Source/VaRestEditorPlugin/Private/VaRest_BreakJson.cpp +++ b/Source/VaRestEditorPlugin/Private/VaRest_BreakJson.cpp @@ -3,6 +3,8 @@ #include "VaRestEditorPluginPrivatePCH.h" #include "VaRest_BreakJson.h" +#include "Runtime/Launch/Resources/Version.h" + #define LOCTEXT_NAMESPACE "VaRest_BreakJson" @@ -55,7 +57,11 @@ class FKCHandler_BreakJson : public FNodeHandlingFunctor FBPTerminal* FieldNameTerm = Context.CreateLocalTerminal(ETerminalSpecification::TS_Literal); FieldNameTerm->Type.PinCategory = CompilerContext.GetSchema()->PC_String; +#if ENGINE_MAJOR_VERSION > 4 || ENGINE_MINOR_VERSION >= 13 + FieldNameTerm->SourcePin = Pin; +#else FieldNameTerm->Source = Pin; +#endif FieldNameTerm->Name = FieldName; FieldNameTerm->TextLiteral = FText::FromString(FieldName); From 259a23ee1365efc039a0f30ec4c849c0eb02cd22 Mon Sep 17 00:00:00 2001 From: "v.alyamkin" Date: Mon, 22 Aug 2016 09:26:00 +0300 Subject: [PATCH 2/3] Minor codestyle fix --- Source/VaRestEditorPlugin/Private/VaRest_BreakJson.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/VaRestEditorPlugin/Private/VaRest_BreakJson.cpp b/Source/VaRestEditorPlugin/Private/VaRest_BreakJson.cpp index a7567f82..17a5d40b 100644 --- a/Source/VaRestEditorPlugin/Private/VaRest_BreakJson.cpp +++ b/Source/VaRestEditorPlugin/Private/VaRest_BreakJson.cpp @@ -3,8 +3,8 @@ #include "VaRestEditorPluginPrivatePCH.h" #include "VaRest_BreakJson.h" -#include "Runtime/Launch/Resources/Version.h" +#include "Runtime/Launch/Resources/Version.h" #define LOCTEXT_NAMESPACE "VaRest_BreakJson" @@ -57,11 +57,11 @@ class FKCHandler_BreakJson : public FNodeHandlingFunctor FBPTerminal* FieldNameTerm = Context.CreateLocalTerminal(ETerminalSpecification::TS_Literal); FieldNameTerm->Type.PinCategory = CompilerContext.GetSchema()->PC_String; -#if ENGINE_MAJOR_VERSION > 4 || ENGINE_MINOR_VERSION >= 13 +#if ENGINE_MINOR_VERSION >= 13 FieldNameTerm->SourcePin = Pin; -#else +#else FieldNameTerm->Source = Pin; -#endif +#endif FieldNameTerm->Name = FieldName; FieldNameTerm->TextLiteral = FText::FromString(FieldName); From 4ba88c8c52917a07eb564ff7e9a939a67e7a1bec Mon Sep 17 00:00:00 2001 From: "v.alyamkin" Date: Fri, 2 Sep 2016 09:56:27 +0300 Subject: [PATCH 3/3] Update plugin version for 16 release --- README.md | 2 +- VaRestPlugin.uplugin | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 671029fb..e7aaa7cf 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Key features: Check the [Wiki](https://hiazma.atlassian.net/wiki/display/VAR) for plugin usage examples and installation notes. -Current version: **1.1 R 14** (UE 4.11-4.12) +Current version: **1.1 R 16** (UE 4.11-4.13) ![SCREENSHOT](SCREENSHOT.jpg) diff --git a/VaRestPlugin.uplugin b/VaRestPlugin.uplugin index b25a89c4..999a7897 100644 --- a/VaRestPlugin.uplugin +++ b/VaRestPlugin.uplugin @@ -2,8 +2,8 @@ "FileVersion" : 3, "FriendlyName" : "VaRest", - "Version" : 15, - "VersionName" : "1.1-r15", + "Version" : 16, + "VersionName" : "1.1-r16", "CreatedBy" : "Vladimir Alyamkin", "CreatedByURL" : "http://alyamkin.com", "EngineVersion" : "4.11.0",