[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12685] trunk/blender/source/blender/src: * Don't swap mouse buttons for particle painting - similar thing

Matt Ebb matt at mke3.net
Tue Nov 27 03:13:58 CET 2007


Revision: 12685
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12685
Author:   broken
Date:     2007-11-27 03:13:56 +0100 (Tue, 27 Nov 2007)

Log Message:
-----------
* Don't swap mouse buttons for particle painting - similar thing
was done a while ago in trunk, but this probably never made
it through to particle branch.

Modified Paths:
--------------
    trunk/blender/source/blender/src/editparticle.c
    trunk/blender/source/blender/src/space.c

Modified: trunk/blender/source/blender/src/editparticle.c
===================================================================
--- trunk/blender/source/blender/src/editparticle.c	2007-11-26 23:11:07 UTC (rev 12684)
+++ trunk/blender/source/blender/src/editparticle.c	2007-11-27 02:13:56 UTC (rev 12685)
@@ -2365,7 +2365,7 @@
 	ParticleSystemModifierData *psmd;
 	ParticleBrushData *brush;
 	float vec1[3], vec2[3];
-	short mval[2], mvalo[2], firsttime = 1, dx, dy, mousebut;
+	short mval[2], mvalo[2], firsttime = 1, dx, dy;
 	int selected = 0, flip;
 
 	if(!PE_can_edit(psys)) return 0;
@@ -2373,9 +2373,6 @@
 	edit = psys->edit;
 	psmd= psys_get_modifier(ob, psys);
 
-	/* check for left mouse / right mouse button select */
-	if (U.flag & USER_LMOUSESELECT) mousebut = R_MOUSE;
-	else mousebut = L_MOUSE;
 	flip= (get_qual() == LR_SHIFTKEY);
 
 	if(pset->brushtype<0) return 0;
@@ -2387,7 +2384,7 @@
 
 	mval[0] = mvalo[0]; mval[1] = mvalo[1];
 
-	while(get_mbut() & mousebut){
+	while(get_mbut() & L_MOUSE){
 		bglFlush();
 		glReadBuffer(GL_BACK);
 		glDrawBuffer(GL_BACK);

Modified: trunk/blender/source/blender/src/space.c
===================================================================
--- trunk/blender/source/blender/src/space.c	2007-11-26 23:11:07 UTC (rev 12684)
+++ trunk/blender/source/blender/src/space.c	2007-11-27 02:13:56 UTC (rev 12685)
@@ -1185,7 +1185,7 @@
 			/* only swap mouse button for selection, in modes where it is relevant.
 			 * painting/sculpting stays on LEFTMOUSE */
 			if (   !((G.f & G_SCULPTMODE) || (G.f & G_WEIGHTPAINT) ||
-				(G.f & G_VERTEXPAINT) || (G.f & G_TEXTUREPAINT)) ||
+				(G.f & G_VERTEXPAINT) || (G.f & G_TEXTUREPAINT) || (G.f & G_PARTICLEEDIT)) ||
 				(G.obedit) )
 			{			
 				if (event==LEFTMOUSE) event = RIGHTMOUSE;





More information about the Bf-blender-cvs mailing list