[Bf-committers] 2.5 progress - trunk src/ freeze? (Ton Roosendaal)

[Ton Roosendaal]

Hi,

Yep go ahead :)

-Ton-

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

On 19 Dec, 2008, at 13:02, Benoit Bolsee wrote:

>>
>> We'll now start with bringing back the editors in Blender. That means
>> all the stuff in source/blender/src... so I'd propose to try
>> to freeze
>> any development you do there.
>
> Can I just sneak a tiny addition in src here for the game engine: a 
> game
> option to enable/disable deprecation warning messages on the console.
> Here is the diff, I hope it's ok:
>
> Index: source/blender/blenkernel/BKE_global.h
> ===================================================================
> --- source/blender/blenkernel/BKE_global.h	(revision 17900)
> +++ source/blender/blenkernel/BKE_global.h	(working copy)
> @@ -227,6 +227,7 @@
>  #define G_FILE_GLSL_NO_RAMPS	 (1 << 19)
>  #define G_FILE_GLSL_NO_NODES	 (1 << 20)
>  #define G_FILE_GLSL_NO_EXTRA_TEX (1 << 21)
> +#define G_FILE_IGNORE_DEPRECATION_WARNINGS	(1 << 22)
>
>  /* G.windowstate */
>  #define G_WINDOWSTATE_USERDEF		0
> Index: source/blender/src/header_info.c
> ===================================================================
> --- source/blender/src/header_info.c	(revision 17900)
> +++ source/blender/src/header_info.c	(working copy)
> @@ -1672,6 +1672,7 @@
>  static void do_info_gamemenu(void *arg, int event)
>  {
>  	switch (event) {
> +	case G_FILE_IGNORE_DEPRECATION_WARNINGS:
>  	case G_FILE_ENABLE_ALL_FRAMES:
>  	case G_FILE_DISPLAY_LISTS:
>  	case G_FILE_SHOW_FRAMERATE:
> @@ -1750,6 +1751,12 @@
>  		uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT,
> "Show Debug Properties",		 0, yco-=20, menuwidth, 19,
> NULL, 0.0, 0.0, 1, G_FILE_SHOW_DEBUG_PROPS, "");
>  	}
>
> +	if(G.fileflags & G_FILE_IGNORE_DEPRECATION_WARNINGS) {
> +		uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT,
> "Ignore Deprecation Warnings",	0, yco-=20, menuwidth, 19, NULL, 0.0,
> 0.0, 1, G_FILE_IGNORE_DEPRECATION_WARNINGS, "");
> +	} else {
> +		uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT,
> "Ignore Deprecation Warnings",		 0, yco-=20, menuwidth, 19,
> NULL, 0.0, 0.0, 1, G_FILE_IGNORE_DEPRECATION_WARNINGS, "");
> +	}
> +
>  	uiDefBut(block, SEPR, 0, "",				0,
> yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 1, 0, "");
>
>  	if(!(G.fileflags & G_FILE_GAME_MAT)) {
> Index: source/blender/src/space.c
> ===================================================================
> --- source/blender/src/space.c	(revision 17900)
> +++ source/blender/src/space.c	(working copy)
> @@ -424,6 +424,9 @@
>  		a= (G.fileflags & G_FILE_GAME_TO_IPO);
>  		SYS_WriteCommandLineInt(syshandle, "game2ipo", a);
>
> +		a= (G.fileflags & G_FILE_IGNORE_DEPRECATION_WARNINGS);
> +		SYS_WriteCommandLineInt(syshandle,
> "ignore_deprecation_warnings", a);
> +
>  		a=(G.fileflags & G_FILE_GAME_MAT);
>  		SYS_WriteCommandLineInt(syshandle, "blender_material",
> a);
>  		a=(G.fileflags & G_FILE_GAME_MAT_GLSL);
>
> _______________________________________________
> Bf-committers mailing list
> Bf-committers at blender.org
> http://lists.blender.org/mailman/listinfo/bf-committers
>