[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29593] branches/render25/source/blender/ render/intern/raytrace/rayobject.cpp: Render Branch: fix bug raytracing instanced objects with use instancing

[Brecht Van Lommel]

Revision: 29593
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29593
Author:   blendix
Date:     2010-06-21 16:16:05 +0200 (Mon, 21 Jun 2010)

Log Message:
-----------
Render Branch: fix bug raytracing instanced objects with use instancing
disabled for the raytracer.

Modified Paths:
--------------
    branches/render25/source/blender/render/intern/raytrace/rayobject.cpp

Modified: branches/render25/source/blender/render/intern/raytrace/rayobject.cpp
===================================================================
--- branches/render25/source/blender/render/intern/raytrace/rayobject.cpp       
2010-06-21 11:43:28 UTC (rev 29592)
+++ branches/render25/source/blender/render/intern/raytrace/rayobject.cpp       
2010-06-21 14:16:05 UTC (rev 29593)
@@ -72,6 +72,8 @@
 
 MALWAYS_INLINE void rayface_from_vlak(RayFace *rayface, ObjectInstanceRen 
*obi, VlakRen *vlr)
 {
+       rayface_from_coords(rayface, obi, vlr, vlr->v1->co, vlr->v2->co, 
vlr->v3->co, vlr->v4 ? vlr->v4->co : 0);
+
        if(obi->transform_primitives)
        {
                mul_m4_v3(obi->mat, rayface->v1);
@@ -81,8 +83,6 @@
                if(RE_rayface_isQuad(rayface))
                        mul_m4_v3(obi->mat, rayface->v4);
        }
-
-       rayface_from_coords(rayface, obi, vlr, vlr->v1->co, vlr->v2->co, 
vlr->v3->co, vlr->v4 ? vlr->v4->co : 0);
 }
 
 RayObject* RE_rayface_from_vlak(RayFace *rayface, ObjectInstanceRen *obi, 
VlakRen *vlr)


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