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

IRC bugfix (thanks samo!):

Browse Source 
The Material buttons copy/paste options (icons) didn't work for node trees.
Code was forgetting to free memory properly.
This commit is contained in:
Ton Roosendaal
2006-07-22 17:11:36 +00:00
parent 56322ca051
commit 9254c07f6e
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,8 +108,11 @@ void free_matcopybuf(void)
matcopybuf.ramp_col= NULL;
matcopybuf.ramp_spec= NULL;
ntreeFreeTree(matcopybuf.nodetree);
if(matcopybuf.nodetree) {
ntreeFreeTree(matcopybuf.nodetree);
MEM_freeN(matcopybuf.nodetree);
matcopybuf.nodetree= NULL;
}
default_mtex(&mtexcopybuf);
}
@@ -166,7 +169,6 @@ void do_buts_buttons(short event)
}
}
matcopybuf.nodetree= ntreeCopyTree(ma->nodetree, 0);
matcopied= 1;
}
break;
@@ -182,9 +184,14 @@ void do_buts_buttons(short event)
if(mtex && mtex->tex) mtex->tex->id.us--;
if(mtex) MEM_freeN(mtex);
}
if(ma->nodetree) {
ntreeFreeTree(ma->nodetree);
MEM_freeN(ma->nodetree);
}
id= (ma->id);
memcpy(G.buts->lockpoin, &matcopybuf, sizeof(Material));
memcpy(ma, &matcopybuf, sizeof(Material));
(ma->id)= id;
if(matcopybuf.ramp_col) ma->ramp_col= MEM_dupallocN(matcopybuf.ramp_col);
@@ -197,7 +204,7 @@ void do_buts_buttons(short event)
if(mtex->tex) id_us_plus((ID *)mtex->tex);
}
}
ntreeFreeTree(ma->nodetree);
ma->nodetree= ntreeCopyTree(matcopybuf.nodetree, 0);
BIF_preview_changed(ID_MA);