Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitchell Stokes <mogurijin@gmail.com>2011-02-22 02:44:11 +0300
committerMitchell Stokes <mogurijin@gmail.com>2011-02-22 02:44:11 +0300
commitb5e3d2a2eaec5ac20c959538a9c161b25e2087a7 (patch)
tree81e76be8139715babb12f487ad35772844b386aa /source/gameengine/GameLogic/SCA_TimeEventManager.cpp
parent648dec3411a526eba9ac3ae2501038028ece4bc7 (diff)
Bugfix #25803 (LibLoad'ed scene objects don't have timer property updated)
The KX_Scenes' SCA_TimeEventManagers were not being merged. These handle the timer prop
Diffstat (limited to 'source/gameengine/GameLogic/SCA_TimeEventManager.cpp')
-rw-r--r--source/gameengine/GameLogic/SCA_TimeEventManager.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/source/gameengine/GameLogic/SCA_TimeEventManager.cpp b/source/gameengine/GameLogic/SCA_TimeEventManager.cpp
index 8b99fd669a9..ac4aa7eba6d 100644
--- a/source/gameengine/GameLogic/SCA_TimeEventManager.cpp
+++ b/source/gameengine/GameLogic/SCA_TimeEventManager.cpp
@@ -109,3 +109,9 @@ void SCA_TimeEventManager::RemoveTimeProperty(CValue* timeval)
}
}
}
+
+vector<CValue*> SCA_TimeEventManager::GetTimeValues()
+{
+ return m_timevalues;
+}
+