OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-20 04:09:16 +00:00
Code Releases Activity

Build 918

Browse Source
This commit is contained in:
CyanWorlds
2013-07-05 15:28:19 -07:00
parent 68ba122afe
commit 46a0cf6206
808 changed files with 148802 additions and 77916 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
MOULOpenSourceClientPlugin/Plasma20/Sources/Tools/MaxConvert/hsMaterialConverter.cpp
View File

@ -105,7 +105,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "../MaxPlasmaMtls/Layers/plLayerTexBitmapPB.h"
#include "../pfSurface/plLayerAVI.h"
#ifdef USE_BINK_SDK
#include "../pfSurface/plLayerBink.h"
#endif
#include "../MaxComponent/plLightMapComponent.h"
#include "../plDrawable/plGeometrySpan.h"
@ -1999,12 +2001,15 @@ static plLayerInterface* IProcessLayerMovie(plPassMtlBase* mtl, plLayerTex* layT
plLayerMovie* movieLayer = nil;
const char* moviePostfix = nil;
#ifdef USE_BINK_SDK
if (isBink)
{
movieLayer = TRACKED_NEW plLayerBink;
moviePostfix = "_bink";
}
else if (isAvi)
else
#endif // USE_BINK_SDK
if (isAvi)
{
movieLayer = TRACKED_NEW plLayerAVI;
moviePostfix = "_avi";

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Tools/MaxConvert/plLayerConverter.cpp
View File

@ -97,7 +97,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "../plPipeline/plDynamicEnvMap.h"
#include "../pfSurface/plLayerAVI.h"
#ifdef USE_BINK_SDK
#include "../pfSurface/plLayerBink.h"
#endif
#include "../MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h"
#include "../MaxPlasmaMtls/Layers/plLayerTex.h"

4
MOULOpenSourceClientPlugin/Plasma20/Sources/Tools/plResBrowser/plResBrowser.vcproj
View File

@ -38,7 +38,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib wininet.lib winmm.lib odbc32.lib odbccp32.lib comctl32.lib Shlwapi.lib libcrypto.a Rpcrt4.lib"
AdditionalDependencies="ws2_32.lib wininet.lib winmm.lib odbc32.lib odbccp32.lib comctl32.lib Shlwapi.lib libeay32.lib Rpcrt4.lib"
OutputFile=".\Debug/plResBrowser.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@ -107,7 +107,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib wininet.lib winmm.lib odbc32.lib odbccp32.lib comctl32.lib Shlwapi.lib libcrypto.a Rpcrt4.lib"
AdditionalDependencies="ws2_32.lib wininet.lib winmm.lib odbc32.lib odbccp32.lib comctl32.lib Shlwapi.lib libeay32.lib Rpcrt4.lib"
OutputFile=".\Release/plResBrowser.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"