svn merge ^/trunk/blender -r42927:42931
authorCampbell Barton <ideasman42@gmail.com>
Wed, 28 Dec 2011 14:05:02 +0000 (14:05 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 28 Dec 2011 14:05:02 +0000 (14:05 +0000)
1  2 
source/blender/blenloader/intern/writefile.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/windowmanager/intern/wm_operators.c

index bedb3e7429bbb6ea502c88876e1ce78f0b6e0d93,ca471bbabcde8f3926f1bb716edfe2a678fc078e..26a67c0504c441109befed38536a93dfdfcadfad
@@@ -214,7 -197,9 +214,7 @@@ typedef struct TFace 
  /* this is so we can save bmesh files that load in trunk, ignoring NGons
   * will eventually be removed */
  
- #define USE_MESH_FORWARDS_COMAT
 -#if 0 /* enable in bmesh branch only for now */
+ #define USE_BMESH_SAVE_AS_COMPAT
 -#endif
  
  
  #endif