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>2012-05-09 03:39:31 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-05-09 03:39:31 +0400
commitc8cbe63947f6ba05584b5dc6d298dd7301e5dbc0 (patch)
tree6a030c8fb79c0908dc4d94fe3e3cdd5b819faefa /intern/cycles/kernel/svm/svm_tex_coord.h
parentf33080532cbefe3837a5dec0613b1fd803ac072e (diff)
Cycles: fix issues with texture coordinates and object scale. Auto texture
space size and location were outdated often, and already computed on demand by blender internal, now do that through RNA as well.
Diffstat (limited to 'intern/cycles/kernel/svm/svm_tex_coord.h')
-rw-r--r--intern/cycles/kernel/svm/svm_tex_coord.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/svm/svm_tex_coord.h b/intern/cycles/kernel/svm/svm_tex_coord.h
index 169307574a2..aa924bcc38b 100644
--- a/intern/cycles/kernel/svm/svm_tex_coord.h
+++ b/intern/cycles/kernel/svm/svm_tex_coord.h
@@ -57,7 +57,7 @@ __device void svm_node_tex_coord(KernelGlobals *kg, ShaderData *sd, float *stack
case NODE_TEXCO_OBJECT: {
if(sd->object != ~0) {
data = sd->P;
- object_position_transform(kg, sd, &data);
+ object_inverse_position_transform(kg, sd, &data);
}
else
data = sd->P;
@@ -106,7 +106,7 @@ __device void svm_node_tex_coord_bump_dx(KernelGlobals *kg, ShaderData *sd, floa
case NODE_TEXCO_OBJECT: {
if(sd->object != ~0) {
data = sd->P + sd->dP.dx;
- object_position_transform(kg, sd, &data);
+ object_inverse_position_transform(kg, sd, &data);
}
else
data = sd->P + sd->dP.dx;
@@ -158,7 +158,7 @@ __device void svm_node_tex_coord_bump_dy(KernelGlobals *kg, ShaderData *sd, floa
case NODE_TEXCO_OBJECT: {
if(sd->object != ~0) {
data = sd->P + sd->dP.dy;
- object_position_transform(kg, sd, &data);
+ object_inverse_position_transform(kg, sd, &data);
}
else
data = sd->P + sd->dP.dy;