Merge branch 'development' into EngineAPI-Refactor

This commit is contained in:
Areloch 2018-12-09 14:48:50 -06:00 committed by GitHub
commit 6cf0c9e360
1933 changed files with 102328 additions and 70545 deletions

View file

@ -449,10 +449,10 @@ void FieldBrushObject::copyFields( SimObject* pSimObject, const char* fieldList
// Yes, so is this field name selected?
// Iterate fields...
for ( U32 fieldIndex = 0; fieldIndex < fields.size(); ++fieldIndex )
for ( U32 findFieldIDx = 0; findFieldIDx < fields.size(); ++findFieldIDx)
{
// Field selected?
if ( staticField.pFieldname == fields[fieldIndex] )
if ( staticField.pFieldname == fields[findFieldIDx] )
{
// Yes, so flag as such.
fieldSpecified = true;