svn merge ^/trunk/blender -r40511:40587

diff --cc CMakeLists.txt
Simple merge

diff --cc source/blender/blenkernel/intern/BME_conversions.c
Simple merge

diff --cc source/blender/blenkernel/intern/blender.c
Simple merge

diff --cc source/blender/blenkernel/intern/key.c
Simple merge

diff --cc source/blender/blenkernel/intern/particle.c
Simple merge

diff --cc source/blender/blenkernel/intern/particle_system.c
Simple merge

diff --cc source/blender/blenlib/intern/pbvh.c
Simple merge

diff --cc source/blender/blenloader/intern/readfile.c
Simple merge

diff --cc source/blender/editors/armature/reeb.c
Simple merge

diff --cc source/blender/editors/interface/SConscript
Simple merge

diff --cc source/blender/editors/object/object_vgroup.c
Simple merge

diff --cc source/blender/editors/physics/particle_edit.c
Simple merge

diff --cc source/blender/editors/sculpt_paint/paint_image.c
Simple merge

diff --cc source/blender/editors/space_view3d/drawmesh.c
Simple merge

diff --cc source/blender/editors/space_view3d/view3d_buttons.c
Simple merge

diff --cc source/blender/editors/transform/transform.c
Simple merge

diff --cc source/blender/editors/transform/transform.h
Simple merge

diff --cc source/blender/editors/transform/transform_conversions.c
Simple merge

diff --cc source/blender/editors/util/editmode_undo.c
Simple merge

diff --cc source/blender/editors/uvedit/uvedit_parametrizer.c
Simple merge

diff --cc source/blender/gpu/intern/gpu_buffers.c
Simple merge

diff --cc source/blender/makesdna/DNA_modifier_types.h
Simple merge

diff --cc source/blender/makesrna/SConscript
Simple merge

diff --cc source/blender/makesrna/intern/CMakeLists.txt
Simple merge

diff --cc source/blender/makesrna/intern/SConscript
Simple merge

diff --cc source/blender/makesrna/intern/rna_mesh.c
index 4895ba3d6416d59fc7a0eed45040645ff565c8b4,00c79c32b3a30332e23dff3879a261c977001902..ce390c5c99f49479c139292e58657f262a24b840
--- 1/source/blender/makesrna/intern/rna_mesh.c
--- 2/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@@ -1417,15 -1366,7 +1417,9 @@@ static void rna_def_mtexpoly(BlenderRN
  {
        StructRNA *srna;
        PropertyRNA *prop;
-       static const EnumPropertyItem transp_items[]= {
-               {TF_SOLID, "OPAQUE", 0, "Opaque", "Render color of textured face as color"},
-               {TF_ADD, "ADD", 0, "Add", "Render face transparent and add color of face"},
-               {TF_ALPHA, "ALPHA", 0, "Alpha", "Render polygon transparent, depending on alpha channel of the texture"},
-               {TF_CLIP, "CLIPALPHA", 0, "Clip Alpha", "Use the images alpha values clipped with no blending (binary alpha)"},
-               {0, NULL, 0, NULL, NULL}};
 -      const int uv_dim[]= {4, 2};
 +#if 0  /* BMESH_TODO: needed later when do another todo */
 +      int uv_dim[]= {4, 2};
 +#endif
  
        srna= RNA_def_struct(brna, "MeshTextureFaceLayer", NULL);
        RNA_def_struct_ui_text(srna, "Mesh Texture Face Layer", "Layer of texture faces in a Mesh datablock");

diff --cc source/blender/makesrna/intern/rna_modifier.c
Simple merge

diff --cc source/blender/makesrna/intern/rna_object.c
Simple merge

diff --cc source/blender/makesrna/intern/rna_scene.c
Simple merge

diff --cc source/blender/modifiers/intern/MOD_armature.c
Simple merge

diff --cc source/blender/modifiers/intern/MOD_bevel.c
Simple merge

diff --cc source/blender/modifiers/intern/MOD_cast.c
Simple merge

diff --cc source/blender/modifiers/intern/MOD_curve.c
Simple merge

diff --cc source/blender/modifiers/intern/MOD_displace.c
Simple merge

diff --cc source/blender/modifiers/intern/MOD_hook.c
Simple merge

diff --cc source/blender/modifiers/intern/MOD_lattice.c
Simple merge

diff --cc source/blender/modifiers/intern/MOD_smooth.c
Simple merge

diff --cc source/blender/modifiers/intern/MOD_warp.c
Simple merge

diff --cc source/blender/modifiers/intern/MOD_wave.c
Simple merge

diff --cc source/blender/render/intern/source/convertblender.c
Simple merge

diff --cc source/blender/render/intern/source/strand.c
Simple merge

diff --cc source/blender/windowmanager/SConscript
Simple merge

diff --cc source/blender/windowmanager/intern/wm_init_exit.c
Simple merge

diff --cc source/blenderplayer/CMakeLists.txt
Simple merge

diff --cc source/creator/CMakeLists.txt
Simple merge

diff --cc source/creator/creator.c
Simple merge

diff --cc source/gameengine/Converter/BL_BlenderDataConversion.cpp
Simple merge