[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11051] branches/soc-2007-maike/source/ blender/src: Segfault correction on glsl file open error

[Jiří Hnídek]

Hi Miguel,
I tried to compile your branch at 64 bit Linux and compilation was ended
with this error:

Compiling ==> 'space.c'
source/blender/src/space.c: In function ‘drawinfospace’:
source/blender/src/space.c:3773: error: ‘USER_GLSL’ undeclared (first
use in this function)
source/blender/src/space.c:3773: error: (Each undeclared identifier is
reported only once
source/blender/src/space.c:3773: error: for each function it appears in.)

I didn't find any file with definition of USER_GLSL.

Jiri

Miguel Torres Lima wrote:
> Revision: 11051
>           http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11051
> Author:   maike
> Date:     2007-06-25 20:44:31 +0200 (Mon, 25 Jun 2007)
> 
> Log Message:
> -----------
> Segfault correction on glsl file open error
> 
> Modified Paths:
> --------------
>     branches/soc-2007-maike/source/blender/src/editnode.c
>     branches/soc-2007-maike/source/blender/src/glsl_light.c
>     branches/soc-2007-maike/source/blender/src/glsl_material.c
>     branches/soc-2007-maike/source/blender/src/glsl_node_util.c
>     branches/soc-2007-maike/source/blender/src/glsl_util.c
>     branches/soc-2007-maike/source/blender/src/glutil.c
>     branches/soc-2007-maike/source/blender/src/space.c
> Modified: branches/soc-2007-maike/source/blender/src/space.c
> ===================================================================
> --- branches/soc-2007-maike/source/blender/src/space.c	2007-06-25 18:44:28 UTC (rev 11050)
> +++ branches/soc-2007-maike/source/blender/src/space.c	2007-06-25 18:44:31 UTC (rev 11051)
> @@ -126,6 +126,7 @@
>  #include "BIF_toolbox.h"
>  #include "BIF_usiblender.h"
>  #include "BIF_previewrender.h"
> +#include "BIF_glutil.h"
>  
>  #include "BSE_edit.h"
>  #include "BSE_view.h"
> @@ -3088,8 +3089,8 @@
>  	uiBlock *block;
>  	static short cur_light=0;
>  	float fac, col[3];
> -	short xpos, ypos, ypostab,  buth, rspace, dx, y1, y2, y3, y4, y5, y6;
> -	short y2label, y3label, y4label, y5label, y6label;
> +	short xpos, ypos, ypostab,  buth, rspace, dx, y1, y2, y3, y4, y5, y6, y7;
> +	short y2label, y3label, y4label, y5label, y6label, y7label;
>  	short spref, mpref, lpref, smfileselbut;
>  	short edgsp, midsp;
>  	char naam[32];
> @@ -3140,6 +3141,7 @@
>  	y4 = ypos+3*(buth+rspace);
>  	y5 = ypos+4*(buth+rspace);
>  	y6 = ypos+5*(buth+rspace);
> +	y7 = ypos+6*(buth+rspace);
>  
>  
>  	y2label = y2-2;		/* adjustments to offset the labels down to align better */
> @@ -3147,6 +3149,7 @@
>  	y4label = y4-2;
>  	y5label = y5-2;
>  	y6label = y6-2;
> +	y7label = y7-2;
>  
>  
>  	/* set the color to blue and draw the main 'tab' controls */
> @@ -3745,28 +3748,37 @@
>  			&(U.uiflag), 0, 0, 0, 0, "Hide files/datablocks that start with a dot(.*)");
>  
>  		uiDefBut(block, LABEL,0,"OpenGL:",
> -			(xpos+edgsp+(5*midsp)+(5*mpref)),y6label,mpref,buth,
> +			(xpos+edgsp+(5*midsp)+(5*mpref)),y7label,mpref,buth,
>  			0, 0, 0, 0, 0, "");
>  		uiDefButBitI(block, TOGN, USER_DISABLE_MIPMAP, B_MIPMAPCHANGED, "Mipmaps",
> -			(xpos+edgsp+(5*mpref)+(5*midsp)),y5,mpref,buth,
> +			(xpos+edgsp+(5*mpref)+(5*midsp)),y6,mpref,buth,
>  			&(U.gameflags), 0, 0, 0, 0, "Toggles between mipmap textures on (beautiful) and off (fast)");
>  		
>  		/* main choices pup: note, it uses collums, and the seperators (%l) then have to fill both halves equally for the menu to work */
>  		uiDefButS(block, MENU, B_GLRESLIMITCHANGED, "GL Texture Clamp Off%x0|%l|GL Texture Clamp 8192%x8192|GL Texture Clamp 4096%x4096|GL Texture Clamp 2048%x2048|GL Texture Clamp 1024%x1024|GL Texture Clamp 512%x512|GL Texture Clamp 256%x256|GL Texture Clamp 128%x128",
> -													(xpos+edgsp+(5*mpref)+(5*midsp)),y4,mpref,buth, &(U.glreslimit), 0, 0, 0, 0, "Limit the texture size to save graphics memory");
> +													(xpos+edgsp+(5*mpref)+(5*midsp)),y5,mpref,buth, &(U.glreslimit), 0, 0, 0, 0, "Limit the texture size to save graphics memory");
>  		
>  		uiDefButBitI(block, TOG, USER_VERTEX_ARRAYS, 0, "Vertex Arrays",
> -			(xpos+edgsp+(5*mpref)+(5*midsp)),y3,mpref,buth,
> +			(xpos+edgsp+(5*mpref)+(5*midsp)),y4,mpref,buth,
>  			&(U.gameflags), 0, 0, 0, 0, "Toggles between vertex arrays on (less reliable) and off (more reliable)");
>  
>  		uiDefButI(block, NUM, 0, "Time Out ",
> -			(xpos+edgsp+(5*mpref)+(5*midsp)), y2, mpref, buth, 
> +			(xpos+edgsp+(5*mpref)+(5*midsp)), y3, mpref, buth, 
>  			&U.textimeout, 0.0, 3600.0, 30, 2, "Time since last access of a GL texture in seconds after which it is freed. (Set to 0 to keep textures allocated)");
>  		uiDefButI(block, NUM, 0, "Collect Rate ",
> -			(xpos+edgsp+(5*mpref)+(5*midsp)), y1, mpref, buth, 
> +			(xpos+edgsp+(5*mpref)+(5*midsp)), y2, mpref, buth, 
>  			&U.texcollectrate, 1.0, 3600.0, 30, 2, "Number of seconds between each run of the GL texture garbage collector.");
>  
> +		if(has_glsl_support()){
> +		            uiDefButBitI(block, TOG, USER_GLSL, B_GLSLCHANGED, "GLSL Preview",
> +			       (xpos+edgsp+(5*mpref)+(5*midsp)),y1, mpref, buth,
> +			       &(U.flag), 0, 0, 0, 0, "Toggles between GLSL preview on the Viewport3D on and off");
> +		}
> +		else{
>  
> +		}
> +		
> +
>  		uiDefBut(block, LABEL,0,"Audio mixing buffer:",
>  			(xpos+edgsp+(2*midsp)+(2*mpref)),y3label,mpref,buth,
>  			0, 0, 0, 0, 0, "");
> 
> 
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
-------------- next part --------------
A non-text attachment was scrubbed...
Name: jiri.hnidek.vcf
Type: text/x-vcard
Size: 402 bytes
Desc: not available
Url : http://lists.blender.org/pipermail/bf-committers/attachments/20070626/2d16e418/attachment.vcf 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 3241 bytes
Desc: S/MIME Cryptographic Signature
Url : http://lists.blender.org/pipermail/bf-committers/attachments/20070626/2d16e418/attachment.bin