svn merge ^/trunk/blender -r42550:42564
authorCampbell Barton <ideasman42@gmail.com>
Sun, 11 Dec 2011 01:06:43 +0000 (01:06 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 11 Dec 2011 01:06:43 +0000 (01:06 +0000)
1  2 
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/readfile.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/makesdna/DNA_meshdata_types.h
source/blender/makesrna/intern/rna_object.c

index 501636723ccb468122106e57de70eb928e93e8a9,66e1333bf664ec051e036b8022c930fd10bbe3b6..d1b530dae731d3bbbeab1d256acfdee38ff24935
@@@ -118,10 -94,9 +118,10 @@@ typedef struct MSticky 
  
  typedef struct MSelect {
        int index;
-       int type;
+       int type; /* EDITVERT/EDITEDGE/EDITFACE */
  } MSelect;
  
 +/*tesselation uv face data*/
  typedef struct MTFace {
        float uv[4][2];
        struct Image *tpage;