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

@ -172,8 +172,8 @@ SimGroup* ForestBrush::getGroup()
bool ForestBrush::containsItemData( const ForestItemData *inData )
{
SimObjectList::iterator iter = objectList.begin();
for ( ; iter != objectList.end(); iter++ )
SimObjectList::iterator iter = mObjectList.begin();
for ( ; iter != mObjectList.end(); iter++ )
{
ForestBrushElement *pElement = dynamic_cast<ForestBrushElement*>(*iter);