archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: rename "nested" to "embedded"

Browse Source 
Reviewers: mont29

Differential Revision: https://developer.blender.org/D7476
This commit is contained in:
Jacques Lucke
2020-04-20 16:14:45 +02:00
parent d1da2f0b9e
commit 665bf41f3c
10 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,7 +130,7 @@ static void material_free_data(ID *id)
/* is no lib link block, but material extension */
if (material->nodetree) {
ntreeFreeNestedTree(material->nodetree);
ntreeFreeEmbeddedTree(material->nodetree);
MEM_freeN(material->nodetree);
material->nodetree = NULL;
}
@@ -1599,7 +1599,7 @@ void BKE_material_copybuf_paste(Main *bmain, Material *ma)
GPU_material_free(&ma->gpumaterial);
if (ma->nodetree) {
ntreeFreeNestedTree(ma->nodetree);
ntreeFreeEmbeddedTree(ma->nodetree);
MEM_freeN(ma->nodetree);
}