kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix [#35500] Material Copy Crash on specific scenes

Browse Source 
check material textures exist before using in a pasted material.
This commit is contained in:
Campbell Barton 2013-05-25 00:23:23 +00:00
parent 28937676f3
commit 2026e6a7b3
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/intern/material.c
View File

@ -1597,7 +1597,15 @@ void paste_matcopybuf(Material *ma)
mtex = ma->mtex[a];
if (mtex) {
ma->mtex[a] = MEM_dupallocN(mtex);
if (mtex->tex) id_us_plus((ID *)mtex->tex);
if (mtex->tex) {
/* first check this is in main (we may have loaded another file) [#35500] */
if (BLI_findindex(&G.main->tex, mtex->tex) != -1) {
id_us_plus((ID *)mtex->tex);
}
else {
ma->mtex[a]->tex = NULL;
}
}
}
}