From b5e3d2a2eaec5ac20c959538a9c161b25e2087a7 Mon Sep 17 00:00:00 2001 From: Mitchell Stokes Date: Mon, 21 Feb 2011 23:44:11 +0000 Subject: 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 --- source/gameengine/Ketsji/KX_Scene.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'source/gameengine/Ketsji') diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index 87cb46e65a9..721d2013e05 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -1857,6 +1857,16 @@ bool KX_Scene::MergeScene(KX_Scene *other) /* when merging objects sensors are moved across into the new manager, dont need to do this here */ } + + /* grab any timer properties from the other scene */ + SCA_TimeEventManager *timemgr= GetTimeEventManager(); + SCA_TimeEventManager *timemgr_other= other->GetTimeEventManager(); + vector times = timemgr_other->GetTimeValues(); + + for(unsigned int i= 0; i < times.size(); i++) { + timemgr->AddTimeProperty(times[i]); + } + } return true; } -- cgit v1.2.3