bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brecht Van Lommel 2009-01-27 20:17:32 +00:00
parent 4977609832
commit 2e610b3fb2
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/src/header_buttonswin.c
View File

@ -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 @@ void do_buts_buttons(short event)
}
matcopybuf.nodetree= ntreeCopyTree(ma->nodetree, 0);
matcopybuf.preview= NULL;
matcopybuf.gpumaterial.first= matcopybuf.gpumaterial.last= NULL;
matcopied= 1;
}
break;
@ -188,6 +191,8 @@ void do_buts_buttons(short event)
ntreeFreeTree(ma->nodetree);
MEM_freeN(ma->nodetree);
}
GPU_materials_free(ma);
id= (ma->id);
memcpy(ma, &matcopybuf, sizeof(Material));