Merged changes in the trunk up to revision 42692.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 17 Dec 2011 21:24:39 +0000 (21:24 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 17 Dec 2011 21:24:39 +0000 (21:24 +0000)
1  2 
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_orientations.c
source/blender/makesdna/DNA_meshdata_types.h
source/blender/render/intern/source/convertblender.c

index 44cfc7b7aa0bb986774c2b2a3c2a3b0293cca4db,66e1333bf664ec051e036b8022c930fd10bbe3b6..7ebf2fe09487b996e4e77e32a2f56a85db6a253a
@@@ -194,14 -194,8 +194,9 @@@ typedef struct MRecast
  #define ME_LOOSEEDGE          (1<<7)
  /* #define ME_SEAM_LAST               (1<<8) */ /* UNUSED */
  #define ME_SHARP                      (1<<9)    /* only reason this flag remains a 'short' */
 +#define ME_FREESTYLE_EDGE     (1<<10)
  
  /* puno = vertexnormal (mface) */
- /* render assumes flips to be ordered like this */
- #define ME_FLIPV1             1
- #define ME_FLIPV2             2
- #define ME_FLIPV3             4
- #define ME_FLIPV4             8
  #define ME_PROJXY             16
  #define ME_PROJXZ             32
  #define ME_PROJYZ             64
  /* flag (mface) */
  #define ME_SMOOTH                     1
  #define ME_FACE_SEL                   2
 +#define ME_FREESTYLE_FACE     4
                                                /* flag ME_HIDE==16 is used here too */ 
- /* mselect->type */
- #define ME_VSEl       0
- #define ME_ESEl 1
- #define ME_FSEL 2
  /* mtface->flag */
  #define TF_SELECT     1 /* use MFace hide flag (after 2.43), should be able to reuse after 2.44 */
  #define TF_ACTIVE     2 /* deprecated! */