Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2004-12-07 20:46:14 +0300
committerTon Roosendaal <ton@blender.org>2004-12-07 20:46:14 +0300
commit0e7ac575c097f834d1151048e5ce7d44c4f825c7 (patch)
tree383355423d28bf8e051a484bf2729cac0ce2e698 /source/blender/src/buttons_shading.c
parentd0cdf2bd4b237c321e61278a94be4fd04eeb3619 (diff)
Sneak in little feature for texture editing pleasure;
- New channel for "Map to" added, "Warp" - Use the slider next to the option to set amount of influence the texture will have on the coordinates of the next texture. - Warp uses for this the same values as for Normal or Displacement mapping - Warp remains active for all channels, until replaced (or zeroed).
Diffstat (limited to 'source/blender/src/buttons_shading.c')
-rw-r--r--source/blender/src/buttons_shading.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index f14269cd1b4..a2d7da34c2e 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -2622,7 +2622,10 @@ static void material_panel_map_to(Material *ma)
uiDefButF(block, NUMSLI, B_MATPRV, "Nor ", 155,80,155,19, &(mtex->norfac), 0.0, 25.0, 0, 0, "Sets the amount the texture affects normal values");
uiDefButF(block, NUMSLI, B_MATPRV, "Var ", 155,60,155,19, &(mtex->varfac), 0.0, 1.0, 0, 0, "Sets the amount the texture affects other values");
uiDefButF(block, NUMSLI, B_MATPRV, "Disp ", 155,40,155,19, &(mtex->dispfac), 0.0, 1.0, 0, 0, "Sets the amount the texture displaces the surface");
- uiBlockEndAlign(block);
+
+ uiBlockBeginAlign(block);
+ uiDefButS(block, TOG|BIT|13, B_MATPRV, "Warp", 155,10,40,19, &(mtex->mapto), 0, 0, 0, 0, "Let the texture warp texture coordinates of next channels");
+ uiDefButF(block, NUMSLI, B_MATPRV, "fac ", 195,10,115,19, &(mtex->warpfac), 0.0, 1.0, 0, 0, "Sets the amount the texture affects texture coordinates of next channels");
}