[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37453] trunk/blender/source/blender/ render/intern/source: Fix #27540: bug with bump mapping + reflection texture coordinates + nodes.

[Brecht Van Lommel]

Revision: 37453
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37453
Author:   blendix
Date:     2011-06-13 14:56:47 +0000 (Mon, 13 Jun 2011)
Log Message:
-----------
Fix #27540: bug with bump mapping + reflection texture coordinates + nodes.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/render_texture.c
    trunk/blender/source/blender/render/intern/source/shadeinput.c

Modified: trunk/blender/source/blender/render/intern/source/render_texture.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/render_texture.c  
2011-06-13 14:55:39 UTC (rev 37452)
+++ trunk/blender/source/blender/render/intern/source/render_texture.c  
2011-06-13 14:56:47 UTC (rev 37453)
@@ -2192,6 +2192,7 @@
                                }
                        }
                        else if(mtex->texco==TEXCO_REFL) {
+                               calc_R_ref(shi);
                                co= shi->ref; dx= shi->dxref; dy= shi->dyref;
                        }
                        else if(mtex->texco==TEXCO_NORM) {
@@ -2509,9 +2510,6 @@
                                        shi->orn[0]= -shi->vn[0];
                                        shi->orn[1]= -shi->vn[1];
                                        shi->orn[2]= -shi->vn[2];
-                                       
-                                       /* reflection vector */
-                                       calc_R_ref(shi);
                                }
                        }
 

Modified: trunk/blender/source/blender/render/intern/source/shadeinput.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/shadeinput.c      
2011-06-13 14:55:39 UTC (rev 37452)
+++ trunk/blender/source/blender/render/intern/source/shadeinput.c      
2011-06-13 14:56:47 UTC (rev 37453)
@@ -543,11 +543,6 @@
                        shi->orn[2]= -shi->vn[2];
                }
 
-               if(texco & TEXCO_REFL) {
-                       /* mirror reflection color textures (and envmap) */
-                       calc_R_ref(shi);    /* wrong location for normal maps! 
XXXXXXXXXXXXXX */
-               }
-
                if(texco & TEXCO_STRESS) {
                        /* not supported */
                }
@@ -1205,11 +1200,6 @@
                        shi->orn[2]= -shi->vn[2];
                }
                
-               if(texco & TEXCO_REFL) {
-                       /* mirror reflection color textures (and envmap) */
-                       calc_R_ref(shi);        /* wrong location for normal 
maps! XXXXXXXXXXXXXX */
-               }
-               
                if(texco & TEXCO_STRESS) {
                        float *s1, *s2, *s3;
                        

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs