[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13103] trunk/blender/source/blender/src/ transform.c: trackball rotate patch from bebraw so using the Shift key works as expected .

Martin Poirier theeth at yahoo.com
Wed Jan 2 22:49:05 CET 2008


I'd really prefer if transform patches were applied by
myself. Regardless of how simple they might look.

Thanks,
Martin

--- Campbell Barton <ideasman42 at gmail.com> wrote:

> Revision: 13103
>          
>
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13103
> Author:   campbellbarton
> Date:     2008-01-02 22:40:05 +0100 (Wed, 02 Jan
> 2008)
> 
> Log Message:
> -----------
> trackball rotate patch from bebraw so using the
> Shift key works as expected.
> 
> Modified Paths:
> --------------
>     trunk/blender/source/blender/src/transform.c
> 
> Modified:
> trunk/blender/source/blender/src/transform.c
>
===================================================================
> --- trunk/blender/source/blender/src/transform.c
> 2008-01-02 21:36:51 UTC (rev 13102)
> +++ trunk/blender/source/blender/src/transform.c
> 2008-01-02 21:40:05 UTC (rev 13103)
> @@ -2310,7 +2310,7 @@
>  	dphi = saacos((float)deler);
>  	if( (dx1*dy2-dx2*dy1)>0.0 ) dphi= -dphi;
>  
> -	if(G.qual & LR_SHIFTKEY) t->fac += dphi/30.0f;
> +	if(t->flag & T_SHIFT_MOD) t->fac += dphi/30.0f;
>  	else t->fac += dphi;
>  
>  	/*
> @@ -2453,10 +2453,7 @@
>  	/* factore has to become setting or so */
>  	phi[0]= 0.01f*(float)( t->imval[1] - mval[1] );
>  	phi[1]= 0.01f*(float)( mval[0] - t->imval[0] );
> -	
> -	//if(G.qual & LR_SHIFTKEY) t->fac += dphi/30.0f;
> -	//else t->fac += dphi;
> -	
> +		
>  	snapGrid(t, phi);
>  	
>  	if (hasNumInput(&t->num)) {
> @@ -2473,8 +2470,13 @@
>  	}
>  	else {
>  		sprintf(str, "Trackball: %.2f %.2f %s",
> 180.0*phi[0]/M_PI, 180.0*phi[1]/M_PI, t->proptext);
> +	
> +		if(t->flag & T_SHIFT_MOD) {
> +			if(phi[0] != 0.0) phi[0]/= 5.0f;
> +			if(phi[1] != 0.0) phi[1]/= 5.0f;
> +		}
>  	}
> -	
> +
>  	VecRotToMat3(axis1, phi[0], smat);
>  	VecRotToMat3(axis2, phi[1], totmat);
>  	
> 
> 
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
>
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
> 



      ____________________________________________________________________________________
Never miss a thing.  Make Yahoo your home page. 
http://www.yahoo.com/r/hs


More information about the Bf-committers mailing list