merging trunk 15964 -> 16116
authorMartin Poirier <theeth@yahoo.com>
Thu, 14 Aug 2008 21:16:48 +0000 (21:16 +0000)
committerMartin Poirier <theeth@yahoo.com>
Thu, 14 Aug 2008 21:16:48 +0000 (21:16 +0000)
1  2 
source/blender/include/BIF_editarmature.h
source/blender/include/butspace.h
source/blender/src/buttons_editing.c
source/blender/src/editarmature.c
source/gameengine/Converter/BL_ShapeActionActuator.cpp
source/gameengine/GameLogic/SCA_ActuatorSensor.cpp

index 0776ef2cbaf316220556785bfd1ecf6b2234bda4,07fc8f08b4a0a7be2e51fb366e15be1f4f10dc85..f69ebd133bd80291dae9708f3ac538e62e2415e8
@@@ -146,9 -144,10 +146,13 @@@ void     show_all_armature_bones(void)
  
  #define BONESEL_NOSEL 0x80000000      /* Indicates a negative number */
  
 +/* from autoarmature */
 +void BIF_retargetArmature();
 +
+ /* useful macros */
+ #define EBONE_VISIBLE(arm, ebone) ((arm->layer & ebone->layer) && !(ebone->flag & BONE_HIDDEN_A))
+ #define EBONE_EDITABLE(ebone) ((ebone->flag & BONE_SELECTED) && !(ebone->flag & BONE_EDITMODE_LOCKED)) 
  /* used in bone_select_hierachy() */
  #define BONE_SELECT_PARENT    0
  #define BONE_SELECT_CHILD     1
Simple merge
Simple merge
Simple merge