Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.24 Path adjustments #55

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Source/SpoutPlugin/Private/SpoutModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "SpoutPluginPrivatePCH.h"

#include "Core.h"
#include "ModuleManager.h"
#include "Modules\ModuleManager.h"
//#include "IPluginManager.h"

DEFINE_LOG_CATEGORY(SpoutLog);
Expand Down Expand Up @@ -59,4 +59,4 @@ void FSpoutModule::ShutdownModule()

IMPLEMENT_MODULE(FSpoutModule, SpoutPlugin)

#undef LOCTEXT_NAMESPACE
#undef LOCTEXT_NAMESPACE
6 changes: 3 additions & 3 deletions Source/SpoutPlugin/Public/SpoutBPFunctionLibrary.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#pragma once

#if PLATFORM_WINDOWS
#include "AllowWindowsPlatformTypes.h"
#include "Windows\AllowWindowsPlatformTypes.h"
#endif
#include "Spout.h"
#include <d3d11.h>
#if PLATFORM_WINDOWS
#include "HideWindowsPlatformTypes.h"
#include "Windows\HideWindowsPlatformTypes.h"
#endif

#include "SpoutBPFunctionLibrary.generated.h"
Expand Down Expand Up @@ -141,4 +141,4 @@ class SPOUTPLUGIN_API USpoutBPFunctionLibrary : public UBlueprintFunctionLibrary
static UTextureRenderTarget2D* CreateTextureRenderTarget2D(int32 w=1024, int32 h=768, EPixelFormat pixelFormat= EPixelFormat::PF_B8G8R8A8, bool forceLinearGamma = true );

static bool UpdateRegisteredSpout(FName spoutName, ID3D11Texture2D* baseTexture);
};
};
4 changes: 2 additions & 2 deletions Source/SpoutPlugin/Public/SpoutModule.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#pragma once

#include "ModuleManager.h"
#include "Modules\ModuleManager.h"

DECLARE_LOG_CATEGORY_EXTERN(SpoutLog, Log, All);

Expand All @@ -13,4 +13,4 @@ class FSpoutModule : public IModuleInterface
/** IModuleInterface implementation */
virtual void StartupModule() override;
virtual void ShutdownModule() override;
};
};