griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #30413: dynamic paint crash with texture slots with no texture assigned.

Browse Source
This commit is contained in:
Brecht Van Lommel
2012-03-01 20:41:13 +00:00
parent 9aafe32147
commit 2942eab57c
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/render/intern/source/render_texture.c
View File

@@ -3556,6 +3556,8 @@ Material *RE_init_sample_material(Material *orig_mat, Scene *scene)
if(mat->mtex[tex_nr]) {
MTex *mtex = mat->mtex[tex_nr];
if(!mtex->tex) continue;
/* only keep compatible texflags */
mtex->texflag = mtex->texflag & (MTEX_RGBTOINT | MTEX_STENCIL | MTEX_NEGATIVE | MTEX_ALPHAMIX);
@@ -3629,9 +3631,12 @@ void RE_free_sample_material(Material *mat)
if(mat->septex & (1<<tex_nr)) continue;
if(mat->mtex[tex_nr]) {
MTex *mtex= mat->mtex[tex_nr];
free_texture(mtex->tex);
MEM_freeN(mtex->tex);
mtex->tex = NULL;
if(mtex->tex) {
free_texture(mtex->tex);
MEM_freeN(mtex->tex);
mtex->tex = NULL;
}
}
}