[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18702] trunk/blender/source/blender/src/ header_buttonswin.c: Fix for bug #17961: crash with material copy/ past and GLSL.

[Brecht Van Lommel]

Revision: 18702
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18702
Author:   blendix
Date:     2009-01-27 21:17:32 +0100 (Tue, 27 Jan 2009)

Log Message:
-----------
Fix for bug #17961: crash with material copy/past and GLSL.

Modified Paths:
--------------
    trunk/blender/source/blender/src/header_buttonswin.c

Modified: trunk/blender/source/blender/src/header_buttonswin.c
===================================================================
--- trunk/blender/source/blender/src/header_buttonswin.c        2009-01-27 
19:59:12 UTC (rev 18701)
+++ trunk/blender/source/blender/src/header_buttonswin.c        2009-01-27 
20:17:32 UTC (rev 18702)
@@ -77,6 +77,8 @@
 #include "MEM_guardedalloc.h"
 #include "BLI_blenlib.h"
 
+#include "GPU_material.h"
+
 #include "blendef.h"
 #include "mydevice.h"
 #include "butspace.h"
@@ -168,6 +170,7 @@
                        }
                        matcopybuf.nodetree= ntreeCopyTree(ma->nodetree, 0);
                        matcopybuf.preview= NULL;
+                       matcopybuf.gpumaterial.first= 
matcopybuf.gpumaterial.last= NULL;
                        matcopied= 1;
                }
                break;
@@ -188,6 +191,8 @@
                                ntreeFreeTree(ma->nodetree);
                                MEM_freeN(ma->nodetree);
                        }
+
+                       GPU_materials_free(ma);
                        
                        id= (ma->id);
                        memcpy(ma, &matcopybuf, sizeof(Material));


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