svn merge -r39664:39762 https://svn.blender.org/svnroot/bf-blender/trunk/blender

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

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

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

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

diff --cc source/blender/blenlib/BLI_math_vector.h
Simple merge

diff --cc source/blender/blenlib/BLI_utildefines.h
Simple merge

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

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

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

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

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

diff --cc source/blender/editors/include/ED_view3d.h
Simple merge

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

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

diff --cc source/blender/editors/render/render_shading.c
Simple merge

diff --cc source/blender/editors/screen/screen_ops.c
Simple merge

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

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

diff --cc source/blender/editors/space_view3d/drawobject.c
index 59b4652659643ad20146f465cb77288e08d22881,638d197ccf7ddca9cc2abe5ef4f960218eea0329..4b560048b68cd1321e8fd12dc1e553ae28dc9abe
--- 1/source/blender/editors/space_view3d/drawobject.c
--- 2/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@@ -2911,8 -2843,19 +2911,19 @@@ static int draw_mesh_object(Scene *scen
        Object *ob= base->object;
        Object *obedit= scene->obedit;
        Mesh *me= ob->data;
 -      EditMesh *em= me->edit_mesh;
 +      BMEditMesh *em= me->edit_btmesh;
-       int do_alpha_pass= 0, drawlinked= 0, retval= 0, glsl, check_alpha;
+       int do_alpha_pass= 0, drawlinked= 0, retval= 0, glsl, check_alpha, i;
+ 
+       /* If we are drawing shadows and any of the materials don't cast a shadow,
+        * then don't draw the object */
+       if (v3d->flag2 & V3D_RENDER_SHADOW) {
+               for(i=0; i<ob->totcol; ++i) {
+                       Material *ma= give_current_material(ob, i);
+                       if (ma && !(ma->mode & MA_SHADBUF)) {
+                               return 1;
+                       }
+               }
+       }
        
        if(obedit && ob!=obedit && ob->data==obedit->data) {
                if(ob_get_key(ob) || ob_get_key(obedit));
@@@ -6584,20 -6516,19 +6594,19 @@@ void draw_object_backbufsel(Scene *scen
  
        switch( ob->type) {
        case OB_MESH:
-       {
                if(ob->mode & OB_MODE_EDIT) {
                        Mesh *me= ob->data;
 -                      EditMesh *em= me->edit_mesh;
 +                      BMEditMesh *em= me->edit_btmesh;
  
 -                      DerivedMesh *dm = editmesh_get_derived_cage(scene, ob, em, CD_MASK_BAREMESH);
 +                      DerivedMesh *dm = editbmesh_get_derived_cage(scene, ob, em, CD_MASK_BAREMESH);
  
 -                      EM_init_index_arrays(em, 1, 1, 1);
 +                      EDBM_init_index_arrays(em, 1, 1, 1);
  
 -                      bbs_mesh_solid_EM(scene, v3d, ob, dm, ts->selectmode & SCE_SELECT_FACE);
 +                      bbs_mesh_solid_EM(em, scene, v3d, ob, dm, ts->selectmode & SCE_SELECT_FACE);
                        if(ts->selectmode & SCE_SELECT_FACE)
 -                              em_solidoffs = 1+em->totface;
 +                              bm_solidoffs = 1+em->bm->totface;
                        else
 -                              em_solidoffs= 1;
 +                              bm_solidoffs= 1;
                        
                        bglPolygonOffset(rv3d->dist, 1.0);
                        
@@@ -6616,10 -6547,11 +6625,11 @@@
  
                        dm->release(dm);
  
 -                      EM_free_index_arrays();
 +                      EDBM_free_index_arrays(em);
                }
-               else bbs_mesh_solid(scene, ob);
-       }
+               else {
+                       bbs_mesh_solid(scene, ob);
+               }
                break;
        case OB_CURVE:
        case OB_SURF:

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

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

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

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

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

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

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

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