[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25000] trunk...

[Ton Roosendaal]

Hi Nicholas,

Congrats with commit number 25000! :)

-Ton-

------------------------------------------------------------------------
Ton Roosendaal  Blender Foundation   ton at blender.org    www.blender.org
Blender Institute   Entrepotdok 57A  1018AD Amsterdam   The Netherlands

On 29 Nov, 2009, at 7:10, Nicholas Bishop wrote:

> Revision: 25000
>            
> http://projects.blender.org/plugins/scmsvn/viewcvs.php? 
> view=rev&root=bf-blender&revision=25000
> Author:   nicholasbishop
> Date:     2009-11-29 07:10:26 +0100 (Sun, 29 Nov 2009)
>
> Log Message:
> -----------
> UI:
> * Removed hardcoded shortcut keys in 3dview header tooltips
> * Removed an unused function
>
> Modified Paths:
> --------------
>     trunk/blender/source/blender/editors/space_view3d/view3d_header.c
>
> Modified:  
> trunk/blender/source/blender/editors/space_view3d/view3d_header.c
> ===================================================================
> ---  
> trunk/blender/source/blender/editors/space_view3d/view3d_header.c	 
> 2009-11-29 06:04:39 UTC (rev 24999)
> +++  
> trunk/blender/source/blender/editors/space_view3d/view3d_header.c	 
> 2009-11-29 06:10:26 UTC (rev 25000)
> @@ -1887,16 +1887,6 @@
>  	}
>  }
>
> -static int view3d_layer_icon(int but_lay, int ob_lay, int used_lay)
> -{
> -	if (but_lay & ob_lay)
> -		return ICON_LAYER_ACTIVE;
> -	else if (but_lay & used_lay)
> -		return ICON_LAYER_USED;
> -	else
> -		return ICON_BLANK1;
> -}
> -
>  /* Returns the icon associated with an object mode */
>  static int object_mode_icon(int mode)
>  {
> @@ -1955,7 +1945,7 @@
>
>  	uiBlockBeginAlign(block);
>  	uiDefIconTextButS(block, MENU, B_MODESELECT,  
> object_mode_icon(v3d->modeselect), view3d_modeselect_pup(scene) ,
> -			  0,0,126,20, &(v3d->modeselect), 0, 0, 0, 0, "Mode (Hotkeys: Tab,  
> V, Ctrl Tab)");
> +			  0,0,126,20, &(v3d->modeselect), 0, 0, 0, 0, "Mode");
>  	uiBlockEndAlign(block);
>  	
>  	/* Draw type */
> @@ -1990,9 +1980,9 @@
>  		block= uiLayoutGetBlock(row);
>  		
>  		if(v3d->twflag & V3D_USE_MANIPULATOR) {
> -			uiDefIconButBitS(block, TOG, V3D_MANIP_TRANSLATE, B_MAN_TRANS,  
> ICON_MAN_TRANS, 0,0,XIC,YIC, &v3d->twtype, 1.0, 0.0, 0, 0, "Translate  
> manipulator mode (Ctrl Alt G)");
> -			uiDefIconButBitS(block, TOG, V3D_MANIP_ROTATE, B_MAN_ROT,  
> ICON_MAN_ROT, 0,0,XIC,YIC, &v3d->twtype, 1.0, 0.0, 0, 0, "Rotate  
> manipulator mode (Ctrl Alt R)");
> -			uiDefIconButBitS(block, TOG, V3D_MANIP_SCALE, B_MAN_SCALE,  
> ICON_MAN_SCALE, 0,0,XIC,YIC, &v3d->twtype, 1.0, 0.0, 0, 0, "Scale  
> manipulator mode (Ctrl Alt S)");
> +			uiDefIconButBitS(block, TOG, V3D_MANIP_TRANSLATE, B_MAN_TRANS,  
> ICON_MAN_TRANS, 0,0,XIC,YIC, &v3d->twtype, 1.0, 0.0, 0, 0, "Translate  
> manipulator mode");
> +			uiDefIconButBitS(block, TOG, V3D_MANIP_ROTATE, B_MAN_ROT,  
> ICON_MAN_ROT, 0,0,XIC,YIC, &v3d->twtype, 1.0, 0.0, 0, 0, "Rotate  
> manipulator mode");
> +			uiDefIconButBitS(block, TOG, V3D_MANIP_SCALE, B_MAN_SCALE,  
> ICON_MAN_SCALE, 0,0,XIC,YIC, &v3d->twtype, 1.0, 0.0, 0, 0, "Scale  
> manipulator mode");
>  		}
>  			
>  		if (v3d->twmode > (BIF_countTransformOrientation(C) - 1) +  
> V3D_MANIP_CUSTOM) {
> @@ -2000,7 +1990,7 @@
>  		}
>  			
>  		str_menu = BIF_menustringTransformOrientation(C, "Orientation");
> -		uiDefButS(block, MENU, B_MAN_MODE, str_menu,0,0,70,YIC,  
> &v3d->twmode, 0, 0, 0, 0, "Transform Orientation (ALT+Space)");
> +		uiDefButS(block, MENU, B_MAN_MODE, str_menu,0,0,70,YIC,  
> &v3d->twmode, 0, 0, 0, 0, "Transform Orientation");
>  		MEM_freeN(str_menu);
>  	}
>   		
> @@ -2020,9 +2010,9 @@
>
>  		row= uiLayoutRow(layout, 1);
>  		block= uiLayoutGetBlock(row);
> -		uiDefIconButBitS(block, TOG, SCE_SELECT_VERTEX, B_SEL_VERT,  
> ICON_VERTEXSEL, 0,0,XIC,YIC, &em->selectmode, 1.0, 0.0, 0, 0, "Vertex  
> select mode (Ctrl Tab 1)");
> -		uiDefIconButBitS(block, TOG, SCE_SELECT_EDGE, B_SEL_EDGE,  
> ICON_EDGESEL, 0,0,XIC,YIC, &em->selectmode, 1.0, 0.0, 0, 0, "Edge  
> select mode (Ctrl Tab 2)");
> -		uiDefIconButBitS(block, TOG, SCE_SELECT_FACE, B_SEL_FACE,  
> ICON_FACESEL, 0,0,XIC,YIC, &em->selectmode, 1.0, 0.0, 0, 0, "Face  
> select mode (Ctrl Tab 3)");
> +		uiDefIconButBitS(block, TOG, SCE_SELECT_VERTEX, B_SEL_VERT,  
> ICON_VERTEXSEL, 0,0,XIC,YIC, &em->selectmode, 1.0, 0.0, 0, 0, "Vertex  
> select mode");
> +		uiDefIconButBitS(block, TOG, SCE_SELECT_EDGE, B_SEL_EDGE,  
> ICON_EDGESEL, 0,0,XIC,YIC, &em->selectmode, 1.0, 0.0, 0, 0, "Edge  
> select mode");
> +		uiDefIconButBitS(block, TOG, SCE_SELECT_FACE, B_SEL_FACE,  
> ICON_FACESEL, 0,0,XIC,YIC, &em->selectmode, 1.0, 0.0, 0, 0, "Face  
> select mode");
>
>  		BKE_mesh_end_editmesh(obedit->data, em);
>  	}
>
>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>