Last commit fixed the file contents.. but some svn props were missing.
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Tue, 15 Jul 2008 21:08:39 +0000 (21:08 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Tue, 15 Jul 2008 21:08:39 +0000 (21:08 +0000)
So I fixed the problem with merges instead of copying files over.
Also trunk/blender/release/scripts/scripttemplate_ipo_gen.py from revision 14530 was missing. (that was fixed)

svn merge -r 15590:15551 https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-jaguarandi (revert changes to the point where the merge was incorrect)
svn merge -r 15552:15572 https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-jaguarandi (apply branch modifications)
svn merge -r 15392:15590 https://svn.blender.org/svnroot/bf-blender/trunk/blender (merge from trunk)

source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
source/gameengine/GameLogic/SCA_ActuatorEventManager.h
source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
source/gameengine/GameLogic/SCA_ActuatorSensor.h
source/gameengine/Ketsji/KX_NearSensor.cpp
source/gameengine/Ketsji/KX_RadarSensor.cpp
source/gameengine/Rasterizer/Makefile

index c635227140e955227bcbb4853384c85bd25bcf58..28ca1fd673f1fa246b77af79c4d12e8afff59ba0 100644 (file)
@@ -1,5 +1,5 @@
 /**
- * $Id: SCA_ActuatorEventManager.cpp 15444 2008-07-05 17:05:05Z lukep $
+ * $Id$
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
index 98e217c830ee124cf906d864381d0b5485a7a771..b5108764197b216cc6c877fab20228d93e14c024 100644 (file)
@@ -1,5 +1,5 @@
 /**
- * $Id: SCA_ActuatorEventManager.h 15444 2008-07-05 17:05:05Z lukep $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
index a16f71991d6840e15700008ba52fc2d486aa18cd..e1c8ef87dd17e38e6b58d2cffb3d766f14e9464c 100644 (file)
@@ -1,7 +1,7 @@
 /**
  * Actuator sensor
  *
- * $Id: SCA_ActuatorSensor.cpp 15486 2008-07-08 12:18:43Z ben2610 $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
index f662c579ab781adc7ab8b4d6378d4a69ed7b63b4..6086c5bfce0826a2c3b835b13eb56211d68c07a7 100644 (file)
@@ -1,7 +1,7 @@
 /**
  * Actuator sensor
  *
- * $Id: SCA_ActuatorSensor.h 15444 2008-07-05 17:05:05Z lukep $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
index d69871275b97bb7a255b61a4dfb16323a3664af3..89699d80031fc85894da93e49c5306a53e790279 100644 (file)
@@ -135,9 +135,6 @@ CValue* KX_NearSensor::GetReplica()
 
 void KX_NearSensor::ReParent(SCA_IObject* parent)
 {
-
-       SCA_ISensor::ReParent(parent);
-       
        m_client_info->m_gameobject = static_cast<KX_GameObject*>(parent); 
        m_client_info->m_sensors.push_back(this);
        
@@ -151,6 +148,7 @@ void KX_NearSensor::ReParent(SCA_IObject* parent)
 */
        ((KX_GameObject*)GetParent())->GetSGNode()->ComputeWorldTransforms(NULL);
        SynchronizeTransform();
+       SCA_ISensor::ReParent(parent);
 }
 
 
index 987e0b946b20e9774880e18847a0a70247e2503d..9dab09f8f2af990f190abeae756f54fb9f47cbab 100644 (file)
@@ -92,6 +92,10 @@ CValue* KX_RadarSensor::GetReplica()
        if (replica->m_physCtrl)
        {
                replica->m_physCtrl = replica->m_physCtrl->GetReplica();
+               if (replica->m_physCtrl)
+               {
+                       replica->m_physCtrl->setNewClientInfo(replica->m_client_info);
+               }
        }
 
        //todo: make sure replication works fine!
index 1ca3e3b028356686a83320a01147ca8597104b93..e3b1f274ee52b8dc66dd27171174153ed79054dd 100644 (file)
@@ -41,6 +41,9 @@ CPPFLAGS += -I$(NAN_STRING)/include
 CPPFLAGS += -I$(NAN_MOTO)/include
 CPPFLAGS += -I../../kernel/gen_system
 CPPFLAGS += -I../BlenderRoutines
+CPPFLAGS += -I../Expressions
+
+CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
 
 ifeq ($(OS),darwin)
        CPPFLAGS += -fpascal-strings