TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adds ability to adjust padding to guiTextListCtrl's rows

Browse source 
ForcedMaterialMeshMgr tweaked to allow proper setting of override material
Ongoing WIP of update/fixing of options menus
WIP of expanded visualizers, including material complexity viz
Adds no-pie flag when compiling on linux with non-clang compilers
This commit is contained in:
Areloch 2019-09-06 00:00:17 -05:00
parent 99cee7f32a
commit 7c3bd49615
17 changed files with 912 additions and 487 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Engine/source/renderInstance/forcedMaterialMeshMgr.cpp
View file

@ -126,9 +126,10 @@ const char* ForcedMaterialMeshMgr::_getOverrideMat( void *object, const char *da
bool ForcedMaterialMeshMgr::_setOverrideMat( void *object, const char *index, const char *data )
{
ForcedMaterialMeshMgr &mgr = *reinterpret_cast<ForcedMaterialMeshMgr *>( object );
BaseMatInstance* material;
Sim::findObject( data, material );
mgr.setOverrideMaterial( material );
Material* material;
Sim::findObject(data, material);
mgr.mOverrideMaterial = material;
return false;
}