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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2010-02-16 18:45:19 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2010-02-16 18:45:19 +0300
commitbd638da9a0bbd057b72164eed6583888380490ed (patch)
tree90c535062d48f73329b4597920877964e3c3b97a /source/blender/nodes/intern/TEX_nodes/TEX_distance.c
parent768f20d537967ada2c5e71c05b027533959bdc91 (diff)
Texture Nodes:
* Remove the manual OSA method but rather pass on derivatives to the textures. This means that at the moment e.g. the bricks node is not antialiased, but that image textures are now using mipmaps. Doing oversampling on the whole nodetree is convenient but it is really the individual textures that can do filtering best and quickest. * Image textures in a texture node tree were not color corrected and did not support 2d mapping, now it's passing along shadeinput to make this possible. Would like to avoid this but not sure how. * Fix preview not filling in all pixels when scaling or rotating in the texture nodes.
Diffstat (limited to 'source/blender/nodes/intern/TEX_nodes/TEX_distance.c')
-rw-r--r--source/blender/nodes/intern/TEX_nodes/TEX_distance.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_distance.c b/source/blender/nodes/intern/TEX_nodes/TEX_distance.c
index f17cf861c88..e0fee3e3153 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_distance.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_distance.c
@@ -43,12 +43,12 @@ static bNodeSocketType outputs[]= {
static void valuefn(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread)
{
- float coord1[3], coord2[3];
+ float co1[3], co2[3];
- tex_input_vec(coord1, in[0], p, thread);
- tex_input_vec(coord2, in[1], p, thread);
+ tex_input_vec(co1, in[0], p, thread);
+ tex_input_vec(co2, in[1], p, thread);
- *out = len_v3v3(coord2, coord1);
+ *out = len_v3v3(co2, co1);
}
static void exec(void *data, bNode *node, bNodeStack **in, bNodeStack **out)