Merge branch 'blender-v2.81-release'

source/blender/makesdna/DNA_armature_types.h

@@ -128,9 +128,7 @@ typedef struct bArmature {
 
   int flag;
   int drawtype;
-  /** How vertex deformation is handled in the ge. */
-  int gevertdeformer;
-  char _pad[4];
+
   short deformflag;
   short pathflag;
 
@@ -175,12 +173,6 @@ typedef enum eArmature_Drawtype {
   ARM_WIRE = 4,
 } eArmature_Drawtype;
 
-/* armature->gevertdeformer */
-typedef enum eArmature_VertDeformer {
-  ARM_VDEF_BLENDER = 0,
-  ARM_VDEF_BGE_CPU = 1,
-} eArmature_VertDeformer;
-
 /* armature->deformflag */
 typedef enum eArmature_DeformFlag {
   ARM_DEF_VGROUP = (1 << 0),