Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

use BLI_findstring in more places & remove some warnings, no functional changes.

Browse Source
This commit is contained in:
Campbell Barton
2010-02-22 09:22:36 +00:00
parent 756dace6f5
commit b65a983d39
5 changed files with 13 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
View File

@@ -208,17 +208,14 @@ Scene *KX_BlenderSceneConverter::GetBlenderSceneForName(const STR_String& name)
* Find the specified scene by name, or the first
* scene if nothing matches (shouldn't happen).
*/
for (sce= (Scene*) m_maggie->scene.first; sce; sce= (Scene*) sce->id.next)
if (name == (sce->id.name+2))
return sce;
if((sce= (Scene *)BLI_findstring(&m_maggie->scene, name.ReadPtr(), offsetof(ID, name) + 2)))
return sce;
for (vector<Main*>::iterator it=m_DynamicMaggie.begin(); !(it==m_DynamicMaggie.end()); it++) {
Main *main= *it;
for (sce= (Scene*) main->scene.first; sce; sce= (Scene*) sce->id.next)
if (name == (sce->id.name+2))
return sce;
if((sce= (Scene *)BLI_findstring(&main->scene, name.ReadPtr(), offsetof(ID, name) + 2)))
return sce;
}
return (Scene*)m_maggie->scene.first;