[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22748] branches/blender2.5/blender/source /blender: Smoke:

[Daniel Genrich]

Revision: 22748
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22748
Author:   genscher
Date:     2009-08-24 23:39:48 +0200 (Mon, 24 Aug 2009)

Log Message:
-----------
Smoke:
*enable non-2^n textrues for all gfx cards which support it.
* try to enhance the visual quality under linux a bit when gfx card doesn't support it (still errors visible)

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/space_view3d/drawvolume.c
    branches/blender2.5/blender/source/blender/gpu/intern/gpu_extensions.c

Modified: branches/blender2.5/blender/source/blender/editors/space_view3d/drawvolume.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_view3d/drawvolume.c	2009-08-24 21:16:23 UTC (rev 22747)
+++ branches/blender2.5/blender/source/blender/editors/space_view3d/drawvolume.c	2009-08-24 21:39:48 UTC (rev 22748)
@@ -236,7 +236,7 @@
 
 	GPU_texture_bind(tex, 0);
 
-	// if (!GLEW_ARB_texture_non_power_of_two) 
+	if (!GLEW_ARB_texture_non_power_of_two) 
 	{
 		cor[0] = (float)res[0]/(float)larger_pow2(res[0]);
 		cor[1] = (float)res[1]/(float)larger_pow2(res[1]);

Modified: branches/blender2.5/blender/source/blender/gpu/intern/gpu_extensions.c
===================================================================
--- branches/blender2.5/blender/source/blender/gpu/intern/gpu_extensions.c	2009-08-24 21:16:23 UTC (rev 22747)
+++ branches/blender2.5/blender/source/blender/gpu/intern/gpu_extensions.c	2009-08-24 21:39:48 UTC (rev 22748)
@@ -360,14 +360,13 @@
 		glTexSubImage3D(tex->target, 0, 0, 0, 0, w, h, depth, format, type, pixels);
 	}
 
-	// glTexParameterfv(GL_TEXTURE_3D, GL_TEXTURE_BORDER_COLOR, vfBorderColor);
+	glTexParameterfv(GL_TEXTURE_3D, GL_TEXTURE_BORDER_COLOR, vfBorderColor);
 	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
 	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
 	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_BORDER);
 
-
 	if (pixels)
 		MEM_freeN(pixels);