diff options
author | Campbell Barton <ideasman42@gmail.com> | 2007-03-13 15:50:36 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2007-03-13 15:50:36 +0300 |
commit | 5ae20c6eaf82118ff725a5fb167e80f2c871c42b (patch) | |
tree | 581fb7e25abebabc3f61c9a8ee57d5c61a8edd53 /source/blender | |
parent | a8b41017f193681bc130f25f121de1cfd7a8b866 (diff) |
renamed norepeatX/Y to ClampX/Y
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/makesdna/DNA_image_types.h | 4 | ||||
-rw-r--r-- | source/blender/python/api2_2x/Image.c | 8 | ||||
-rw-r--r-- | source/blender/python/api2_2x/doc/Image.py | 8 | ||||
-rw-r--r-- | source/blender/src/drawimage.c | 6 | ||||
-rw-r--r-- | source/blender/src/drawmesh.c | 4 |
5 files changed, 15 insertions, 15 deletions
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index 78672d7cde8..a18493ea189 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -117,8 +117,8 @@ typedef struct Image { #define IMA_TWINANIM 2 #define IMA_COLCYCLE 4 /* Depreciated */ #define IMA_MIPMAP_COMPLETE 8 /* all mipmap levels in OpenGL texture set? */ -#define IMA_NOREPEAT_U 16 -#define IMA_NOREPEAT_V 32 +#define IMA_CLAMP_U 16 +#define IMA_CLAMP_V 32 /* ima->type and ima->source moved to BKE_image.h, for API */ diff --git a/source/blender/python/api2_2x/Image.c b/source/blender/python/api2_2x/Image.c index 7cd22afff7d..18640ce6f7c 100644 --- a/source/blender/python/api2_2x/Image.c +++ b/source/blender/python/api2_2x/Image.c @@ -1312,10 +1312,10 @@ static PyGetSetDef BPy_Image_getseters[] = { "image antialiasing toggle", (void *)IMA_ANTIALI }, {"reflect", (getter)Image_getFlag, (setter)Image_setFlag, "image reflect toggle", (void *)IMA_REFLECT }, - {"noXTile", (getter)Image_getFlagTpage, (setter)Image_setFlagTpage, - "image reflect toggle", (void *)IMA_REFLECT }, - {"noYTile", (getter)Image_getFlagTpage, (setter)Image_setFlagTpage, - "image reflect toggle", (void *)IMA_REFLECT }, + {"clampX", (getter)Image_getFlagTpage, (setter)Image_setFlagTpage, + "disable tiling on the X axis", (void *)IMA_CLAMP_U }, + {"clampY", (getter)Image_getFlagTpage, (setter)Image_setFlagTpage, + "disable tiling on the Y axis", (void *)IMA_CLAMP_V }, {NULL,NULL,NULL,NULL,NULL} /* Sentinel */ }; diff --git a/source/blender/python/api2_2x/doc/Image.py b/source/blender/python/api2_2x/doc/Image.py index 2adfdfb5d40..a46fd554159 100644 --- a/source/blender/python/api2_2x/doc/Image.py +++ b/source/blender/python/api2_2x/doc/Image.py @@ -111,10 +111,10 @@ class Image: @type bindcode: int @ivar source: Image source type. See L{the Sources dictionary<Sources>} . @type source: int - @ivar noXTile: When true the image will not tile horizontally. - @type noXTile: bool - @ivar noYTile: When true the image will not tile vertically. - @type noYTile: bool + @ivar clampX: When true the image will not tile horizontally. + @type clampX: bool + @ivar clampY: When true the image will not tile vertically. + @type clampY: bool """ def getName(): diff --git a/source/blender/src/drawimage.c b/source/blender/src/drawimage.c index 0a1046f384a..40009b73308 100644 --- a/source/blender/src/drawimage.c +++ b/source/blender/src/drawimage.c @@ -948,10 +948,10 @@ static void image_panel_game_properties(short cntrl) // IMAGE_HANDLER_GAME_PROPE uiDefButS(block, NUM, B_SIMAGEDRAW, "X:", 160,130,70,19, &G.sima->image->xrep, 1.0, 16.0, 0, 0, "Sets the degree of repetition in the X direction"); uiDefButS(block, NUM, B_SIMAGEDRAW, "Y:", 230,130,70,19, &G.sima->image->yrep, 1.0, 16.0, 0, 0, "Sets the degree of repetition in the Y direction"); uiBlockBeginAlign(block); - + uiBlockBeginAlign(block); - uiDefButBitS(block, TOG, IMA_NOREPEAT_U, B_SIMAGEDRAW, "No XRep", 160,100,70,19, &G.sima->image->tpageflag, 0, 0, 0, 0, "Disable texture repeating horizontaly"); - uiDefButBitS(block, TOG, IMA_NOREPEAT_V, B_SIMAGEDRAW, "No YRep", 230,100,70,19, &G.sima->image->tpageflag, 0, 0, 0, 0, "Disable texture repeating vertically"); + uiDefButBitS(block, TOG, IMA_CLAMP_U, B_SIMAGEDRAW, "ClampX", 160,100,70,19, &G.sima->image->tpageflag, 0, 0, 0, 0, "Disable texture repeating horizontaly"); + uiDefButBitS(block, TOG, IMA_CLAMP_V, B_SIMAGEDRAW, "ClampY", 230,100,70,19, &G.sima->image->tpageflag, 0, 0, 0, 0, "Disable texture repeating vertically"); uiBlockEndAlign(block); } } diff --git a/source/blender/src/drawmesh.c b/source/blender/src/drawmesh.c index 2d7ac564c52..3d574633219 100644 --- a/source/blender/src/drawmesh.c +++ b/source/blender/src/drawmesh.c @@ -418,11 +418,11 @@ int set_tpage(MTFace *tface) else glBindTexture( GL_TEXTURE_2D, *bind); /* dont tile x/y as set the the game properties */ - if (ima->tpageflag & IMA_NOREPEAT_U) + if (ima->tpageflag & IMA_CLAMP_U) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); else glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - if (ima->tpageflag & IMA_NOREPEAT_V) + if (ima->tpageflag & IMA_CLAMP_V) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); else glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); |