[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39475] trunk/blender/source/blender/ editors/space_view3d/view3d_select.c: fix [#28274] Cant select aditional object in edit mode.

[Campbell Barton]

Revision: 39475
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39475
Author:   campbellbarton
Date:     2011-08-16 22:44:12 +0000 (Tue, 16 Aug 2011)
Log Message:
-----------
fix [#28274] Cant select aditional object in edit mode.
missing feature from 2.4x

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/view3d_select.c

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_select.c	2011-08-16 22:18:24 UTC (rev 39474)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_select.c	2011-08-16 22:44:12 UTC (rev 39475)
@@ -1335,9 +1335,9 @@
 			if(oldbasact != basact) {
 				ED_base_object_activate(C, basact); /* adds notifier */
 			}
+		}
 
-			WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, scene);
-		}
+		WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, scene);
 	}
 
 	return retval;
@@ -1841,8 +1841,8 @@
 	int	retval = 0;
 
 	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)
@@ -1889,7 +1889,7 @@
 	
 	/* properties */
 	RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend selection instead of deselecting everything first.");
-	RNA_def_boolean(ot->srna, "center", 0, "Center", "Use the object center when selecting (object mode only).");
+	RNA_def_boolean(ot->srna, "center", 0, "Center", "Use the object center when selecting, in editmode used to extend object selection.");
 	RNA_def_boolean(ot->srna, "enumerate", 0, "Enumerate", "List objects under the mouse (object mode only).");
 }