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:
authorBenoit Bolsee <benoit.bolsee@online.be>2008-09-23 01:49:48 +0400
committerBenoit Bolsee <benoit.bolsee@online.be>2008-09-23 01:49:48 +0400
commit18c954e95ba8181a67a6e67246d5f507246db007 (patch)
tree606dd95c78cbf360a778346f3bb938feadea863c /source/gameengine/Converter/KX_ConvertActuators.cpp
parent2875cc9cc68b9e57e7525d490fd8d57a3eba8653 (diff)
BGE patch #17569 approved: Make FrameProp: work in Shape Action. PyDoc updated.
Diffstat (limited to 'source/gameengine/Converter/KX_ConvertActuators.cpp')
-rw-r--r--source/gameengine/Converter/KX_ConvertActuators.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/gameengine/Converter/KX_ConvertActuators.cpp b/source/gameengine/Converter/KX_ConvertActuators.cpp
index e8be8de95ed..78791c53d7c 100644
--- a/source/gameengine/Converter/KX_ConvertActuators.cpp
+++ b/source/gameengine/Converter/KX_ConvertActuators.cpp
@@ -210,10 +210,12 @@ void BL_ConvertActuators(char* maggiename,
if (blenderobject->type==OB_MESH){
bActionActuator* actact = (bActionActuator*) bact->data;
STR_String propname = (actact->name ? actact->name : "");
+ STR_String propframe = (actact->frameProp ? actact->frameProp : "");
BL_ShapeActionActuator* tmpbaseact = new BL_ShapeActionActuator(
gameobj,
propname,
+ propframe,
actact->sta,
actact->end,
actact->act,