TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' of https://github.com/GarageGames/Torque3D into memberMess

Browse source 
# Conflicts:
#	Engine/source/console/consoleFunctions.cpp
This commit is contained in:
Azaezel 2018-03-28 15:42:34 -05:00
commit cbce2ee805
154 changed files with 2950 additions and 705 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Engine/source/materials/materialDefinition.cpp
View file

@ -654,35 +654,35 @@ DefineConsoleMethod( Material, getAnimFlags, const char*, (U32 id), , "" )
if(object->mAnimFlags[ id ] & Material::Scroll)
{
if(dStrcmp( animFlags, "" ) == 0)
dStrcpy( animFlags, "$Scroll" );
dStrcpy( animFlags, "$Scroll", 512 );
}
if(object->mAnimFlags[ id ] & Material::Rotate)
{
if(dStrcmp( animFlags, "" ) == 0)
dStrcpy( animFlags, "$Rotate" );
dStrcpy( animFlags, "$Rotate", 512 );
else
dStrcat( animFlags, " | $Rotate");
dStrcat( animFlags, " | $Rotate", 512);
}
if(object->mAnimFlags[ id ] & Material::Wave)
{
if(dStrcmp( animFlags, "" ) == 0)
dStrcpy( animFlags, "$Wave" );
dStrcpy( animFlags, "$Wave", 512 );
else
dStrcat( animFlags, " | $Wave");
dStrcat( animFlags, " | $Wave", 512);
}
if(object->mAnimFlags[ id ] & Material::Scale)
{
if(dStrcmp( animFlags, "" ) == 0)
dStrcpy( animFlags, "$Scale" );
dStrcpy( animFlags, "$Scale", 512 );
else
dStrcat( animFlags, " | $Scale");
dStrcat( animFlags, " | $Scale", 512);
}
if(object->mAnimFlags[ id ] & Material::Sequence)
{
if(dStrcmp( animFlags, "" ) == 0)
dStrcpy( animFlags, "$Sequence" );
dStrcpy( animFlags, "$Sequence", 512 );
else
dStrcat( animFlags, " | $Sequence");
dStrcat( animFlags, " | $Sequence", 512);
}
return animFlags;
@ -718,4 +718,4 @@ bool Material::_setAccuEnabled( void *object, const char *index, const char *dat
AccumulationVolume::refreshVolumes();
}
return true;
}
}