[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19023] trunk/blender/source/blender: disable texture clamping while painting.
Campbell Barton
ideasman42 at gmail.com
Wed Feb 18 04:56:34 CET 2009
Revision: 19023
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19023
Author: campbellbarton
Date: 2009-02-18 04:56:16 +0100 (Wed, 18 Feb 2009)
Log Message:
-----------
disable texture clamping while painting.
Modified Paths:
--------------
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/src/editface.c
Modified: trunk/blender/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_draw.c 2009-02-18 03:13:57 UTC (rev 19022)
+++ trunk/blender/source/blender/gpu/intern/gpu_draw.c 2009-02-18 03:56:16 UTC (rev 19023)
@@ -167,6 +167,8 @@
static int is_pow2_limit(int num)
{
/* take texture clamping into account */
+ if (G.f & G_TEXTUREPAINT)
+ return 1;
if (U.glreslimit != 0 && num > U.glreslimit)
return 0;
@@ -175,6 +177,9 @@
static int smaller_pow2_limit(int num)
{
+ if (G.f & G_TEXTUREPAINT)
+ return 1;
+
/* take texture clamping into account */
if (U.glreslimit != 0 && num > U.glreslimit)
return U.glreslimit;
Modified: trunk/blender/source/blender/src/editface.c
===================================================================
--- trunk/blender/source/blender/src/editface.c 2009-02-18 03:13:57 UTC (rev 19022)
+++ trunk/blender/source/blender/src/editface.c 2009-02-18 03:56:16 UTC (rev 19023)
@@ -51,6 +51,7 @@
#include "DNA_space_types.h"
#include "DNA_screen_types.h"
#include "DNA_scene_types.h"
+#include "DNA_userdef_types.h"
#include "DNA_view3d_types.h"
#include "BKE_brush.h"
@@ -1321,6 +1322,10 @@
if(G.f & G_TEXTUREPAINT) {
G.f &= ~G_TEXTUREPAINT;
+
+ if (U.glreslimit != 0)
+ GPU_free_images();
+
GPU_paint_set_mipmap(1);
}
else if (me) {
@@ -1328,7 +1333,10 @@
if(me->mtface==NULL)
make_tfaces(me);
-
+
+ if (U.glreslimit != 0)
+ GPU_free_images();
+
brush_check_exists(&G.scene->toolsettings->imapaint.brush);
GPU_paint_set_mipmap(0);
}
More information about the Bf-blender-cvs
mailing list