[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29165] branches/render25/source/blender/ render/intern/source/rayshade.c: Render Branch: Fix #22412: crash rendering with octree for raytracing.

[Brecht Van Lommel]

Revision: 29165
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29165
Author:   blendix
Date:     2010-06-02 20:37:16 +0200 (Wed, 02 Jun 2010)

Log Message:
-----------
Render Branch: Fix #22412: crash rendering with octree for raytracing.

Modified Paths:
--------------
    branches/render25/source/blender/render/intern/source/rayshade.c

Modified: branches/render25/source/blender/render/intern/source/rayshade.c
===================================================================
--- branches/render25/source/blender/render/intern/source/rayshade.c    
2010-06-02 18:04:31 UTC (rev 29164)
+++ branches/render25/source/blender/render/intern/source/rayshade.c    
2010-06-02 18:37:16 UTC (rev 29165)
@@ -493,8 +493,10 @@
 
        /* disable options not yet suported by octree,
           they might actually never be supported (unless people really need 
it) */
-       if(re->params.r.raytrace_structure == R_RAYSTRUCTURE_OCTREE)
-               re->params.r.raytrace_options &= ~( R_RAYTRACE_USE_INSTANCES | 
R_RAYTRACE_USE_LOCAL_COORDS);
+       if(re->params.r.raytrace_structure == R_RAYSTRUCTURE_OCTREE) {
+               re->params.r.raytrace_options &= ~R_RAYTRACE_USE_INSTANCES;
+               re->params.r.raytrace_options |= R_RAYTRACE_USE_LOCAL_COORDS;
+       }
 
        if(G.f & G_DEBUG) {
                BENCH(raytree_create_single(re), tree_build);


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