svn merge ^/trunk/blender -r43009:43033
authorCampbell Barton <ideasman42@gmail.com>
Sat, 31 Dec 2011 12:03:36 +0000 (12:03 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 31 Dec 2011 12:03:36 +0000 (12:03 +0000)
13 files changed:
1  2 
CMakeLists.txt
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/SConscript
source/blender/modifiers/intern/MOD_util.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge
Simple merge
index 093ab2f6dc1ba394f3596cbe182bbe3ebd1f5b2e,5fe9851738a35f6174060e99c5ad0ba1f09829a1..dd68694404d0faef74cbacd850c1a01168c4ff27
@@@ -76,9 -76,7 +76,10 @@@ typedef enum ModifierType 
        eModifierType_WeightVGProximity,
        eModifierType_Ocean,
        eModifierType_DynamicPaint,
+       eModifierType_Remesh,
 +
 +      /* BMESH ONLY - keeps getting bumped by new modifiers in trunk */
 +      eModifierType_NgonInterp,
        NUM_MODIFIER_TYPES
  } ModifierType;
  
index bd75285f8f9501aaf6cf3ec37686043362053fe7,9474c572d880d6b303dcdb9a99dfb3ae4cd9c380..98db305e75000f361501b2ec17a3cdea9c64022e
@@@ -3186,10 -3202,7 +3239,10 @@@ void RNA_def_modifier(BlenderRNA *brna
        rna_def_modifier_weightvgproximity(brna);
        rna_def_modifier_dynamic_paint(brna);
        rna_def_modifier_ocean(brna);
+       rna_def_modifier_remesh(brna);
 +
 +      /* BMESH_ONLY */
 +      rna_def_modifier_ngoninterp(brna);
  }
  
  #endif
index 76ea6d6bb73302676c0c855dd8860158079b2065,fec6545678a222e28bfc36c11fc90642640c0642..11013f6a36ed3fa86b63dfa3600259d8ef7e9a7b
@@@ -73,7 -73,7 +73,8 @@@ extern ModifierTypeInfo modifierType_We
  extern ModifierTypeInfo modifierType_WeightVGMix;
  extern ModifierTypeInfo modifierType_WeightVGProximity;
  extern ModifierTypeInfo modifierType_DynamicPaint;
+ extern ModifierTypeInfo modifierType_Remesh;
 +extern ModifierTypeInfo modifierType_NgonInterp;
  
  /* MOD_util.c */
  void modifier_type_init(ModifierTypeInfo *types[]);
Simple merge
index 38cd62046b0c598dca16a2f9b5e3b6aa61e644ca,cc7a5e54fbd3a5491aa7decb82972ed06b1dae34..8c2b86094f190a6944fa61a5f6d63ac0ae4bcc51
@@@ -276,6 -276,6 +276,7 @@@ void modifier_type_init(ModifierTypeInf
        INIT_TYPE(WeightVGMix);
        INIT_TYPE(WeightVGProximity);
        INIT_TYPE(DynamicPaint);
+       INIT_TYPE(Remesh);
 +      INIT_TYPE(NgonInterp);
  #undef INIT_TYPE
  }
Simple merge