diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-12-30 06:25:27 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-12-30 06:25:27 +0400 |
| commit | 0d6ae3fda2e5a3dbde941b6985e6895a42c71b9e (patch) | |
| tree | b0c89b9a01da31fffc6b6db7c9395ff2db97de53 /source/gameengine/Converter/KX_BlenderSceneConverter.cpp | |
| parent | 19103b443711d7c1b3a24f7fab949f71343d8200 (diff) | |
Main API: refactor naming, use BKE_main_ prefix and add main arg.
Diffstat (limited to 'source/gameengine/Converter/KX_BlenderSceneConverter.cpp')
| -rw-r--r-- | source/gameengine/Converter/KX_BlenderSceneConverter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp index b1a76a61afe..c58746a22c1 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp @@ -132,7 +132,7 @@ KX_BlenderSceneConverter::KX_BlenderSceneConverter( m_useglslmat(false), m_use_mat_cache(true) { - tag_main(maggie, 0); /* avoid re-tagging later on */ + BKE_main_id_tag_all(maggie, false); /* avoid re-tagging later on */ m_newfilename = ""; m_threadinfo = new ThreadInfo(); pthread_mutex_init(&m_threadinfo->merge_lock, NULL); @@ -1231,7 +1231,7 @@ bool KX_BlenderSceneConverter::FreeBlendFile(struct Main *maggie) for (vector<Main*>::iterator it=m_DynamicMaggie.begin(); !(it==m_DynamicMaggie.end()); it++) { Main *main= *it; if (main != maggie) { - tag_main(main, 0); + BKE_main_id_tag_all(main, false); } else { maggie_index= i; @@ -1244,7 +1244,7 @@ bool KX_BlenderSceneConverter::FreeBlendFile(struct Main *maggie) return false; m_DynamicMaggie.erase(m_DynamicMaggie.begin() + maggie_index); - tag_main(maggie, 1); + BKE_main_id_tag_all(maggie, true); /* free all tagged objects */ @@ -1490,7 +1490,7 @@ bool KX_BlenderSceneConverter::FreeBlendFile(struct Main *maggie) delete m_status_map[maggie->name]; m_status_map.erase(maggie->name); - free_main(maggie); + BKE_main_free(maggie); return true; } |