Merging with trunk
authorMartin Poirier <theeth@yahoo.com>
Tue, 5 Aug 2008 02:27:09 +0000 (02:27 +0000)
committerMartin Poirier <theeth@yahoo.com>
Tue, 5 Aug 2008 02:27:09 +0000 (02:27 +0000)
15568 - 15963

13 files changed:
1  2 
source/blender/blenlib/intern/arithb.c
source/blender/include/BIF_editarmature.h
source/blender/src/buttons_editing.c
source/blender/src/drawview.c
source/blender/src/editarmature.c
source/blender/src/usiblender.c
source/gameengine/Converter/BL_ShapeActionActuator.cpp
source/gameengine/Converter/BL_ShapeActionActuator.h
source/gameengine/Converter/BL_ShapeDeformer.cpp
source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
source/gameengine/GameLogic/SCA_ActuatorEventManager.h
source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
source/gameengine/GameLogic/SCA_ActuatorSensor.h

index c3660f700b3a9d62ca748d6a349f7a1e6b5ce61b,13c16749612c6a881cf594b3fc18828f0460007f..0776ef2cbaf316220556785bfd1ecf6b2234bda4
@@@ -144,9 -144,10 +146,13 @@@ void     set_locks_armature_bones(short loc
  
  #define BONESEL_NOSEL 0x80000000      /* Indicates a negative number */
  
 +/* from autoarmature */
 +void BIF_retargetArmature();
 +
+ /* used in bone_select_hierachy() */
+ #define BONE_SELECT_PARENT    0
+ #define BONE_SELECT_CHILD     1
  #endif
  
  
Simple merge
Simple merge
Simple merge
Simple merge
index 434a62a123399f576afeb5e8d423025ed0ded6d5,a9b9ad8fa865ff448be41afd7c6dfb30f03d1822..10cbe9f1ac3b57e5adcce97c907ad0c65716ac78
@@@ -1,5 -1,5 +1,5 @@@
  /**
-- * $Id$
++ * $Id:BL_ShapeActionActuator.h 15330 2008-06-23 16:37:51Z theeth $
   *
   * ***** BEGIN GPL LICENSE BLOCK *****
   *
index 28ca1fd673f1fa246b77af79c4d12e8afff59ba0,768a3a45937ad844f8b337179d5c4028f01c00c4..9a47c2628893cf3037371d5c0b9c99b13f0108f9
@@@ -1,5 -1,5 +1,5 @@@
  /**
-- * $Id$
++ * $Id:SCA_ActuatorEventManager.cpp 15567 2008-07-14 14:09:36Z theeth $
   * ***** BEGIN GPL LICENSE BLOCK *****
   *
   * This program is free software; you can redistribute it and/or
index b5108764197b216cc6c877fab20228d93e14c024,a7d61627c23390eb6e913f4bd04ce53c0c6cd2b3..6454decfc620c3c0a0af157d423f6fbdb0a6f8dc
@@@ -1,5 -1,5 +1,5 @@@
  /**
-- * $Id$
++ * $Id:SCA_ActuatorEventManager.h 15567 2008-07-14 14:09:36Z theeth $
   *
   * ***** BEGIN GPL LICENSE BLOCK *****
   *
index e1c8ef87dd17e38e6b58d2cffb3d766f14e9464c,099cb8eebd0b77214bf21ad85a561421aa00f751..8bba37d045a0b48c45471841fd6bbaa843d82d48
@@@ -1,7 -1,7 +1,7 @@@
  /**
   * Actuator sensor
   *
-- * $Id$
++ * $Id:SCA_ActuatorSensor.cpp 15567 2008-07-14 14:09:36Z theeth $
   *
   * ***** BEGIN GPL LICENSE BLOCK *****
   *
index 6086c5bfce0826a2c3b835b13eb56211d68c07a7,a71145f6852c1f960bbe029bba7953bcec544098..568e7158af27e593ee980df5768554b6f2880d58
@@@ -1,7 -1,7 +1,7 @@@
  /**
   * Actuator sensor
   *
-- * $Id$
++ * $Id:SCA_ActuatorSensor.h 15567 2008-07-14 14:09:36Z theeth $
   *
   * ***** BEGIN GPL LICENSE BLOCK *****
   *