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

1b602f33 · wester · 60b76068 · 080cd1b4 · 1b602f33
Commit 1b602f33 authored Aug 28, 2017 by wester
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

DynamicTextureUtilities.h Source/MasterTestProject/DynamicTextureUtilities.h +1 -1

No files found.
--- a/Source/MasterTestProject/DynamicTextureUtilities.h
+++ b/Source/MasterTestProject/DynamicTextureUtilities.h
@@ -32,6 +32,6 @@ public:
 	//static void SetDynamicTextureAndIndex(class UStaticMeshComponent* Component, class UTexture2D* Texture, int32 Index, FName IndexParameterName, FName TextureParameterName);
 	
 	// input rgb flaot array
-	static UTexture2D* UDynamicTextureUtilities::CreateDynamicTextureWithData(int length, uint8* data);
+	static UTexture2D* CreateDynamicTextureWithData(int length, uint8* data);
 	
 };