[Bf-blender-cvs] [1fb9bb8] master: Fix for own regression, editmode object selection (Ctrl+RMB)
Campbell Barton
noreply at git.blender.org
Tue Jan 14 14:31:59 CET 2014
Commit: 1fb9bb815a5df8ba3b4b2ebdaa4cad192fecd145
Author: Campbell Barton
Date: Wed Jan 15 00:25:50 2014 +1100
https://developer.blender.org/rB1fb9bb815a5df8ba3b4b2ebdaa4cad192fecd145
Fix for own regression, editmode object selection (Ctrl+RMB)
Wasn't working because of editmode override (which uses regular object selection in editmode)
===================================================================
M source/blender/editors/space_view3d/view3d_select.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index e56cd1e..d18fb45 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -2222,7 +2222,7 @@ static int view3d_select_exec(bContext *C, wmOperator *op)
bool toggle = RNA_boolean_get(op->ptr, "toggle");
bool center = RNA_boolean_get(op->ptr, "center");
bool enumerate = RNA_boolean_get(op->ptr, "enumerate");
- bool object = RNA_boolean_get(op->ptr, "object");
+ bool object = (RNA_boolean_get(op->ptr, "object") && obedit); /* only force object select for editmode */
bool retval = false;
int location[2];
More information about the Bf-blender-cvs
mailing list