diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-02-07 23:07:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-07 23:24:05 +0400 |
| commit | b3afbcab8ff2330c1473647be330a3ffe9b11885 (patch) | |
| tree | e86b9c7d9676e63b8da92da79889dee13b8be186 /source/gameengine | |
| parent | 1c24d954f4ac63f22b703756b6664a4ad1b363d4 (diff) | |
ListBase API: add utility api funcs for clearing and checking empty
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Converter/BL_ArmatureObject.cpp | 6 | ||||
| -rw-r--r-- | source/gameengine/VideoTexture/VideoFFmpeg.cpp | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/gameengine/Converter/BL_ArmatureObject.cpp b/source/gameengine/Converter/BL_ArmatureObject.cpp index 7ce1c7c815a..34d706eff03 100644 --- a/source/gameengine/Converter/BL_ArmatureObject.cpp +++ b/source/gameengine/Converter/BL_ArmatureObject.cpp @@ -116,9 +116,9 @@ void game_copy_pose(bPose **dst, bPose *src, int copy_constraint) // BKE_copy_constraints NULLs listb, no need to make extern for this operation. BKE_copy_constraints(&listb, &pchan->constraints, FALSE); pchan->constraints= listb; - } else { - pchan->constraints.first = NULL; - pchan->constraints.last = NULL; + } + else { + BLI_listbase_clear(&pchan->constraints); } if (pchan->custom) { diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.cpp b/source/gameengine/VideoTexture/VideoFFmpeg.cpp index 3bad7c92efe..44017f37d29 100644 --- a/source/gameengine/VideoTexture/VideoFFmpeg.cpp +++ b/source/gameengine/VideoTexture/VideoFFmpeg.cpp @@ -73,12 +73,12 @@ m_isThreaded(false), m_isStreaming(false), m_stopThread(false), m_cacheStarted(f setFlip(true); // construction is OK *hRslt = S_OK; - m_thread.first = m_thread.last = NULL; + BLI_listbase_clear(&m_thread); pthread_mutex_init(&m_cacheMutex, NULL); - m_frameCacheFree.first = m_frameCacheFree.last = NULL; - m_frameCacheBase.first = m_frameCacheBase.last = NULL; - m_packetCacheFree.first = m_packetCacheFree.last = NULL; - m_packetCacheBase.first = m_packetCacheBase.last = NULL; + BLI_listbase_clear(&m_frameCacheFree); + BLI_listbase_clear(&m_frameCacheBase); + BLI_listbase_clear(&m_packetCacheFree); + BLI_listbase_clear(&m_packetCacheBase); } // destructor |