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

Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into Enumnanigans

Browse source
This commit is contained in:
AzaezelX 2024-07-24 17:58:27 -05:00
commit 72c67e196a
394 changed files with 49666 additions and 46898 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Engine/source/gui/editor/inspector/field.cpp
View file

@ -451,16 +451,16 @@ void GuiInspectorField::setWordData(const S32& wordIndex, const char* data, bool
StringBuilder newFieldData;
const U32 wordCount = StringUnit::getUnitCount(fieldData, " \t\n");
for (U32 i = 0; i < wordCount; i++)
for (U32 wc = 0; wc < wordCount; wc++)
{
if (i != 0)
if (wc != 0)
newFieldData.append(" ");
if (i == wordIndex)
if (wc == wordIndex)
newFieldData.append(data);
else
{
newFieldData.append(StringUnit::getUnit(fieldData, i, " \t\n"));
newFieldData.append(StringUnit::getUnit(fieldData, wc, " \t\n"));
}
}

2
Engine/source/gui/shaderEditor/guiShaderEditor.h
View file

@ -144,4 +144,4 @@ public:
void canHitSelectedNodes(bool state = true);
};
#endif _GUISHADEREDITOR_H_
#endif //_GUISHADEREDITOR_H_

7
Engine/source/gui/worldEditor/worldEditor.cpp
View file

@ -867,6 +867,9 @@ void WorldEditor::terrainSnapSelection(Selection* sel, U8 modifier, Point3F gizm
case AlignNegZ:
rot.set(mDegToRad(-90.0f), 0.0f, mDegToRad(180.0f));
break;
default:
break;
}
MatrixF mat = MathUtils::createOrientFromDir(ri.normal);
@ -1999,7 +2002,7 @@ void WorldEditor::on3DMouseMove(const Gui3DMouseEvent & event)
if ( !mHitObject )
{
SceneObject *hitObj = NULL;
if ( collide(event, &hitObj) && !hitObj->isDeleted() && hitObj->isSelectionEnabled() && !objClassIgnored(hitObj) )
if ( collide(event, &hitObj) && hitObj && !hitObj->isDeleted() && hitObj->isSelectionEnabled() && !objClassIgnored(hitObj) )
{
mHitObject = hitObj;
}
@ -2060,7 +2063,7 @@ void WorldEditor::on3DMouseDown(const Gui3DMouseEvent & event)
}
SceneObject *hitObj = NULL;
if ( collide( event, &hitObj ) && hitObj->isSelectionEnabled() && !objClassIgnored( hitObj ) )
if ( collide( event, &hitObj ) && hitObj && hitObj->isSelectionEnabled() && !objClassIgnored( hitObj ) )
{
mPossibleHitObject = hitObj;
mNoMouseDrag = true;