svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22130:22205
authorCampbell Barton <ideasman42@gmail.com>
Tue, 4 Aug 2009 05:34:21 +0000 (05:34 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 4 Aug 2009 05:34:21 +0000 (05:34 +0000)
1  2 
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Ketsji/KX_ConstraintActuator.cpp
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_GameObject.h
source/gameengine/Ketsji/KX_Scene.cpp
source/gameengine/Ketsji/KX_Scene.h

@@@ -36,6 -36,8 +36,7 @@@
  #include "MT_Matrix3x3.h"
  #include "KX_GameObject.h"
  #include "KX_RayCast.h"
 -#include "blendef.h"
+ #include "KX_PythonInit.h" // KX_GetActiveScene
  
  #ifdef HAVE_CONFIG_H
  #include <config.h>
Simple merge
Simple merge