[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40070] trunk/blender: Fix #28590: Sculpt Overlay Texture in Viewport Glitched and Wrong icon for Overlay Option ?

[Sergey Sharybin]

Revision: 40070
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40070
Author:   nazgul
Date:     2011-09-09 13:42:22 +0000 (Fri, 09 Sep 2011)
Log Message:
-----------
Fix #28590: Sculpt Overlay Texture in Viewport Glitched and Wrong icon for Overlay Option?

Use clamp to border for fixed textures.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c

Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2011-09-09 13:37:17 UTC (rev 40069)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2011-09-09 13:42:22 UTC (rev 40070)
@@ -768,9 +768,9 @@
             col = row.column()
 
             if brush.use_texture_overlay:
-                col.prop(brush, "use_texture_overlay", toggle=True, text="", icon='MUTE_IPO_OFF')
+                col.prop(brush, "use_texture_overlay", toggle=True, text="", icon='RESTRICT_VIEW_OFF')
             else:
-                col.prop(brush, "use_texture_overlay", toggle=True, text="", icon='MUTE_IPO_ON')
+                col.prop(brush, "use_texture_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON')
 
             col.active = tex_slot.map_mode in {'FIXED', 'TILED'}
 

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c	2011-09-09 13:37:17 UTC (rev 40069)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c	2011-09-09 13:42:22 UTC (rev 40070)
@@ -322,8 +322,8 @@
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
 	if (br->mtex.brush_map_mode == MTEX_MAP_MODE_FIXED) {
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
 	}
 
 	return 1;