- fix for error in 2.31 release! in editmode, ctrl+rightmouse didnt allow
authorTon Roosendaal <ton@blender.org>
Sat, 17 Jan 2004 12:54:11 +0000 (12:54 +0000)
committerTon Roosendaal <ton@blender.org>
Sat, 17 Jan 2004 12:54:11 +0000 (12:54 +0000)
  selection of other objects, for vertex parenting.
  I added comments to the call to remind.

source/blender/src/space.c

index 4d89b93ecde00b42e893c2d77df5615052be7a25..f9937dfaff93cea46460ce53083abaeb71a9efc4 100644 (file)
@@ -738,14 +738,16 @@ void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
                                        else if(G.obedit->type==OB_ARMATURE)
                                                mouse_armature();
                                }
-                               else if((G.obedit) && (G.qual & (LR_CTRLKEY|LR_ALTKEY)))
+                               else if((G.obedit) && (G.qual == (LR_CTRLKEY|LR_ALTKEY)))
+                                       mouse_mesh();   // edge select
+                               else if((G.obedit) && (G.qual == (LR_CTRLKEY|LR_ALTKEY|LR_SHIFTKEY)))
                                        mouse_mesh();   // edge select
                                else if(G.obpose) { 
                                        if (G.obpose->type==OB_ARMATURE)
                                                mousepose_armature();
                                }
                                else if(G.qual==LR_CTRLKEY)
-                                       mouse_select();
+                                       mouse_select(); // also allow in editmode, for vertex parenting
                                else if(G.f & G_FACESELECT)
                                        face_select();
                                else if( G.f & (G_VERTEXPAINT|G_TEXTUREPAINT))