diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-02-15 21:35:35 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-02-15 21:38:51 +0300 |
| commit | 9a0fb589f70ce20618291b30ec45b230f8ff234d (patch) | |
| tree | ee6f5c246ac7c911aedb072eaa1a5546d81e2994 /source/gameengine/Converter | |
| parent | a1495366af1d53382e6f01e4c75c39dcd137217e (diff) | |
Cleanup: reorganize BKE ID tagging functions.
BKE_main_id_tag_/BKE_main_id_flag_ were horrible naming now that we split those
into flags (for presistent one) and tags (for runtime ones).
Got rid of previous 'tag_' functions behavior (those who were dedicated shortcuts
to set/clear LIB_TAG_DOIT), so now '_tag_' functions affect tags, and '_flag_'
functions affect flags.
Diffstat (limited to 'source/gameengine/Converter')
| -rw-r--r-- | source/gameengine/Converter/KX_BlenderSceneConverter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp index ad1fdf2f06a..96328da60bd 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp @@ -126,7 +126,7 @@ KX_BlenderSceneConverter::KX_BlenderSceneConverter( m_useglslmat(false), m_use_mat_cache(true) { - BKE_main_id_tag_all(maggie, false); /* avoid re-tagging later on */ + BKE_main_id_tag_all(maggie, LIB_TAG_DOIT, false); /* avoid re-tagging later on */ m_newfilename = ""; m_threadinfo = new ThreadInfo(); m_threadinfo->m_pool = BLI_task_pool_create(engine->GetTaskScheduler(), NULL); @@ -1045,7 +1045,7 @@ bool KX_BlenderSceneConverter::FreeBlendFile(Main *maggie) for (vector<Main *>::iterator it = m_DynamicMaggie.begin(); !(it == m_DynamicMaggie.end()); it++) { Main *main = *it; if (main != maggie) { - BKE_main_id_tag_all(main, false); + BKE_main_id_tag_all(main, LIB_TAG_DOIT, false); } else { maggie_index = i; @@ -1058,7 +1058,7 @@ bool KX_BlenderSceneConverter::FreeBlendFile(Main *maggie) return false; m_DynamicMaggie.erase(m_DynamicMaggie.begin() + maggie_index); - BKE_main_id_tag_all(maggie, true); + BKE_main_id_tag_all(maggie, LIB_TAG_DOIT, true); /* free all tagged objects */ KX_SceneList *scenes = m_ketsjiEngine->CurrentScenes(); |