Revision: 28107
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28107
Author:   blendix
Date:     2010-04-09 17:47:12 +0200 (Fri, 09 Apr 2010)

Log Message:
-----------
Render Branch: Fix crash drawing dupli lamps with cone visualization.

Modified Paths:
--------------
    branches/render25/source/blender/editors/space_view3d/drawobject.c

Modified: branches/render25/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- branches/render25/source/blender/editors/space_view3d/drawobject.c  
2010-04-09 15:22:29 UTC (rev 28106)
+++ branches/render25/source/blender/editors/space_view3d/drawobject.c  
2010-04-09 15:47:12 UTC (rev 28107)
@@ -971,7 +971,7 @@
        char col[4];
        int drawcone= (dt>OB_WIRE && !(G.f & G_PICKSEL) && la->type == LA_SPOT 
&& (la->mode & LA_SHOW_CONE));
        
-       if(drawcone && !v3d->transp) {
+       if(drawcone && !v3d->transp && (base->flag & OB_FROMDUPLI)==0) {
                /* in this case we need to draw delayed */
                add_view3d_after(v3d, base, V3D_TRANSP, flag);
                return;


_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to