svn merge ^/trunk/blender -r42372:42416
authorCampbell Barton <ideasman42@gmail.com>
Sun, 4 Dec 2011 18:39:19 +0000 (18:39 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 4 Dec 2011 18:39:19 +0000 (18:39 +0000)
24 files changed:
1  2 
source/blender/CMakeLists.txt
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/multires.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/mesh_data.c
source/blender/editors/mesh/meshtools.c
source/blender/editors/metaball/mball_edit.c
source/blender/editors/object/object_bake.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_transform.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_conversions.c
source/blender/makesdna/DNA_key_types.h
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_object.c
source/blender/modifiers/intern/MOD_mirror.c
source/blender/render/intern/source/convertblender.c

Simple merge
index 9749714791dd8e014f65ae8b8d902c795debf3dc,7253d426ca6586f7b7a6529d8158df5bbab7bbc4..a1e3b84f8985de542d3a0e26b4cb120d30aced8e
@@@ -601,9 -418,8 +601,9 @@@ void MESH_OT_drop_named_image(wmOperato
  {
        /* identifiers */
        ot->name= "Assign Image to UV Map";
-       ot->description= "Assigns Image to active UV Map, or creates a UV Map";
+       ot->description= "Assign Image to active UV Map, or create an UV Map";
        ot->idname= "MESH_OT_drop_named_image";
 +
        
        /* api callbacks */
        ot->poll= layers_poll;
index f8b48a2c60f05f40cfdcf1b12e0758c01d1af21a,12fb9b92602d0cabd2de78133f2e978c6898024e..ee5cf96f1106c6b3313df1966b318479d0877b73
@@@ -96,6 -92,5 +97,5 @@@ typedef struct Key 
  #define KEYBLOCK_MUTE                 (1<<0)
  #define KEYBLOCK_SEL                  (1<<1)
  #define KEYBLOCK_LOCKED                       (1<<2)
 -
 +#define KEYBLOCK_MISSING              (1<<3) /*temporary flag*/
  #endif
index 125c18fa7c4d2146697966e15cc29cf7fa17b9ea,b7d9208e5958cb56ea4242bbd9fe35785ee5626c..443bdfe8dd69ed74dfa7d66d06c2ac7e77af8abf
@@@ -62,21 -58,12 +63,21 @@@ typedef struct Mesh 
  
        struct BoundBox *bb;
        
-       struct Ipo *ipo;                // XXX depreceated... old animation system
+       struct Ipo *ipo  DNA_DEPRECATED;  /* old animation system, deprecated for 2.5 */
        struct Key *key;
        struct Material **mat;
 +      
 +      /*new face structures*/
 +      struct MPoly *mpoly;
 +      struct MTexPoly *mtpoly;
 +      struct MLoop *mloop;
 +      struct MLoopUV *mloopuv;
 +      struct MLoopCol *mloopcol;
  
 -      struct MFace *mface;    /* array of mesh object mode faces */
 -      struct MTFace *mtface;  /* store face UV's and texture here */
 +      /*mface stores the tesselation (triangulation) of the mesh,
 +        real faces are now stored in nface.*/
 +      struct MFace *mface;    /* array of mesh object mode faces for tesselation */
 +      struct MTFace *mtface;  /* store tesselation face UV's and texture here */
        struct TFace *tface;    /* depecrated, use mtface */
        struct MVert *mvert;    /* array of verts */
        struct MEdge *medge;    /* array of edges */