mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-02-14 04:03:46 +00:00
Revert "Updated SDL, Bullet and OpenAL soft libs"
This reverts commit 370161cfb1.
This commit is contained in:
parent
160dc00c07
commit
e7ee94428e
1102 changed files with 62741 additions and 204988 deletions
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
#include "scene/sceneRenderState.h"
|
||||
#include "core/util/systemInterfaceList.h"
|
||||
#include "core/util/SystemInterfaceList.h"
|
||||
#include "ts/tsShape.h"
|
||||
#include "ts/tsShapeInstance.h"
|
||||
#include "T3D/assets/ShapeAsset.h"
|
||||
|
|
@ -59,4 +59,4 @@ public:
|
|||
|
||||
//Render our particular interface's data
|
||||
static void renderInterface(U32 interfaceIndex, SceneRenderState* state);
|
||||
};
|
||||
};
|
||||
|
|
@ -126,7 +126,7 @@ public:
|
|||
|
||||
void clear();
|
||||
|
||||
inline bool operator ==(const ProbeRenderInst& b) const
|
||||
inline bool ProbeRenderInst::operator ==(const ProbeRenderInst& b) const
|
||||
{
|
||||
return mProbeIdx == b.mProbeIdx;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -405,11 +405,8 @@ Var* ShaderFeatureHLSL::getInTexCoord( const char *name,
|
|||
texCoord->setType( type );
|
||||
}
|
||||
|
||||
//AssertFatal( dStrcmp( type, (const char*)texCoord->type ) == 0,
|
||||
// "ShaderFeatureHLSL::getInTexCoord - Type mismatch!" );
|
||||
|
||||
if (dStrcmp(type, (const char*)texCoord->type) != 0)
|
||||
return nullptr;
|
||||
AssertFatal( dStrcmp( type, (const char*)texCoord->type ) == 0,
|
||||
"ShaderFeatureHLSL::getInTexCoord - Type mismatch!" );
|
||||
|
||||
return texCoord;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue