svn merge -r39558:39800 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 13 Sep 2011 06:39:17 +0000 (06:39 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 13 Sep 2011 06:39:17 +0000 (06:39 +0000)
19 files changed:
1  2 
release/scripts/startup/bl_ui/properties_data_mesh.py
release/scripts/startup/bl_ui/space_view3d.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/editors/armature/editarmature.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c

@@@ -6618,23 -6619,8 +6697,23 @@@ void draw_object_backbufsel(Scene *scen
                        EM_free_index_arrays();
                }
                else {
 -                      bbs_mesh_solid(scene, ob);
 +                      Mesh *me= ob->data;
 +                      if(me->editflag & ME_EDIT_VERT_SEL) {
 +                              DerivedMesh *dm = mesh_get_derived_final(scene, ob, scene->customdata_mask);
 +                              WM_set_framebuffer_index_color(me->totvert+2);
 +                              glColor3ub(0, 0, 0);
 +
-                               dm->drawMappedFaces(dm, bbs_mesh_solid_hide2__setDrawOpts, me, 0, GPU_enable_material);
++                              dm->drawMappedFaces(dm, bbs_mesh_solid_hide2__setDrawOpts, me, 0, GPU_enable_material, NULL);
 +
 +                              
 +                              bbs_obmode_mesh_verts(scene, ob, dm, 1);
 +                              em_vertoffs = me->totvert+1;
 +                              dm->release(dm);
 +                      }
-                       else bbs_mesh_solid(scene, ob);
++                      else {
++                              bbs_mesh_solid(scene, ob);
++                      }
                }
-               
-       }
                break;
        case OB_CURVE:
        case OB_SURF:
@@@ -1996,10 -1844,8 +2002,11 @@@ static int view3d_select_invoke(bContex
        short extend= RNA_boolean_get(op->ptr, "extend");
        short center= RNA_boolean_get(op->ptr, "center");
        short enumerate= RNA_boolean_get(op->ptr, "enumerate");
+       short object= RNA_boolean_get(op->ptr, "object");
        int     retval = 0;
 +      // Jason
 +      Mesh *me;
 +      Scene *scene = CTX_data_scene(C);
  
        view3d_operator_needs_opengl(C);