2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19323...
[blender.git] / source / gameengine / Converter / KX_ConvertActuators.cpp
index 3a6122e..eb2d0a1 100644 (file)
@@ -585,15 +585,6 @@ void BL_ConvertActuators(char* maggiename,
                                                                originalval = converter->FindGameObject(editobact->ob);
                                                        }
                                                }
-                                               MT_Vector3 linvelvec (
-                                                       KX_BLENDERTRUNC(editobact->linVelocity[0]),
-                                                       KX_BLENDERTRUNC(editobact->linVelocity[1]),
-                                                       KX_BLENDERTRUNC(editobact->linVelocity[2]));
-                                               
-                                               MT_Vector3 angvelvec (
-                                                       KX_BLENDERTRUNC(editobact->angVelocity[0]),
-                                                       KX_BLENDERTRUNC(editobact->angVelocity[1]),
-                                                       KX_BLENDERTRUNC(editobact->angVelocity[2]));
                                                
                                                KX_SCA_AddObjectActuator* tmpaddact = 
                                                        new KX_SCA_AddObjectActuator(
@@ -601,9 +592,9 @@ void BL_ConvertActuators(char* maggiename,
                                                                originalval,
                                                                editobact->time,
                                                                scene,
-                                                               linvelvec.getValue(),
+                                                               editobact->linVelocity,
                                                                (editobact->localflag & ACT_EDOB_LOCAL_LINV)!=0,
-                                                               angvelvec.getValue(),
+                                                               editobact->angVelocity,
                                                                (editobact->localflag & ACT_EDOB_LOCAL_ANGV)!=0
                                                                );
                                                                
@@ -1017,9 +1008,10 @@ void BL_ConvertActuators(char* maggiename,
                        bVisibilityActuator *vis_act = (bVisibilityActuator *) bact->data;
                        KX_VisibilityActuator * tmp_vis_act = NULL;
                        bool v = ((vis_act->flag & ACT_VISIBILITY_INVISIBLE) != 0);
+                       bool o = ((vis_act->flag & ACT_VISIBILITY_OCCLUSION) != 0);
                        bool recursive = ((vis_act->flag & ACT_VISIBILITY_RECURSIVE) != 0);
 
-                       tmp_vis_act = new KX_VisibilityActuator(gameobj, !v, recursive);
+                       tmp_vis_act = new KX_VisibilityActuator(gameobj, !v, o, recursive);
                        
                        baseact = tmp_vis_act;
                }