[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17022] trunk/blender/source/blender/gpu/ intern/gpu_material.c: Fix for bug #17809: crash with glsl materials and nodes refresh,

[Brecht Van Lommel]

Revision: 17022
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17022
Author:   blendix
Date:     2008-10-11 20:52:36 +0200 (Sat, 11 Oct 2008)

Log Message:
-----------
Fix for bug #17809: crash with glsl materials and nodes refresh,
didn't attach to the right materials to the lamp.

Modified Paths:
--------------
    trunk/blender/source/blender/gpu/intern/gpu_material.c

Modified: trunk/blender/source/blender/gpu/intern/gpu_material.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_material.c      2008-10-11 
16:22:49 UTC (rev 17021)
+++ trunk/blender/source/blender/gpu/intern/gpu_material.c      2008-10-11 
18:52:36 UTC (rev 17022)
@@ -693,7 +693,7 @@
                                                shr->spec, &shr->spec);
                                
                                add_user_list(&mat->lamps, lamp);
-                               add_user_list(&lamp->materials, ma);
+                               add_user_list(&lamp->materials, 
shi->gpumat->ma);
                                return;
                        }
                        
@@ -702,7 +702,7 @@
        }
        else if((G.fileflags & G_FILE_GLSL_NO_SHADOWS) && (lamp->mode & 
LA_ONLYSHADOW)) {
                add_user_list(&mat->lamps, lamp);
-               add_user_list(&lamp->materials, ma);
+               add_user_list(&lamp->materials, shi->gpumat->ma);
                return;
        }
        else
@@ -755,7 +755,7 @@
        }
 
        add_user_list(&mat->lamps, lamp);
-       add_user_list(&lamp->materials, ma);
+       add_user_list(&lamp->materials, shi->gpumat->ma);
 }
 
 static void material_lights(GPUShadeInput *shi, GPUShadeResult *shr)


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