Merge remote-tracking branch 'origin/master' into 1.10
# Conflicts: # Source/Editor/SceneGraph/Actors/StaticModelNode.cs # Source/Engine/Graphics/Models/Mesh.cs # Source/Engine/Graphics/Models/ModelData.h
This commit is contained in:
@@ -732,7 +732,12 @@ Array<ScriptingObject*, HeapAllocation> Scripting::GetObjects()
|
||||
{
|
||||
Array<ScriptingObject*> objects;
|
||||
_objectsLocker.Lock();
|
||||
#if USE_OBJECTS_DISPOSE_CRASHES_DEBUGGING
|
||||
for (const auto& e : _objectsDictionary)
|
||||
objects.Add(e.Value.Ptr);
|
||||
#else
|
||||
_objectsDictionary.GetValues(objects);
|
||||
#endif
|
||||
_objectsLocker.Unlock();
|
||||
return objects;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user