Merged 39338-39558
authorJason Hays <jason_hays22@mymail.eku.edu>
Fri, 19 Aug 2011 17:15:30 +0000 (17:15 +0000)
committerJason Hays <jason_hays22@mymail.eku.edu>
Fri, 19 Aug 2011 17:15:30 +0000 (17:15 +0000)
1  2 
release/scripts/startup/bl_ui/properties_data_mesh.py
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/mesh/editmesh_mods.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/makesrna/intern/rna_object.c

@@@ -1997,13 -1839,10 +1997,13 @@@ static int view3d_select_invoke(bContex
        short center= RNA_boolean_get(op->ptr, "center");
        short enumerate= RNA_boolean_get(op->ptr, "enumerate");
        int     retval = 0;
 +      // Jason
 +      Mesh *me;
 +      Scene *scene = CTX_data_scene(C);
  
        view3d_operator_needs_opengl(C);
-       
-       if(obedit) {
+       if(obedit && center==FALSE) {
                if(obedit->type==OB_MESH)
                        retval = mouse_mesh(C, event->mval, extend);
                else if(obedit->type==OB_ARMATURE)