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

misc small edits syncing with trunk

Browse Source
This commit is contained in:
Campbell Barton
2012-08-06 13:59:11 +00:00
parent c93be80be9
commit 385c38f6ed
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/mask.c
View File

@@ -1528,7 +1528,6 @@ void BKE_mask_layer_free(MaskLayer *masklay)
MEM_freeN(masklay);
}
void BKE_mask_layer_free_list(ListBase *masklayers)
{
MaskLayer *masklay = masklayers->first;
@@ -1541,7 +1540,6 @@ void BKE_mask_layer_free_list(ListBase *masklayers)
masklay = masklay_next;
}
}
void BKE_mask_free(Mask *mask)

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

@@ -1443,13 +1443,13 @@ void BKE_node_clipboard_clear(void)
bNode *node, *node_next;
bNodeLink *link, *link_next;
for (link = node_clipboard.links.first; link; link=link_next) {
for (link = node_clipboard.links.first; link; link = link_next) {
link_next = link->next;
nodeRemLink(NULL, link);
}
node_clipboard.links.first = node_clipboard.links.last = NULL;
for (node = node_clipboard.nodes.first; node; node=node_next) {
for (node = node_clipboard.nodes.first; node; node = node_next) {
node_next = node->next;
nodeFreeNode(NULL, node);
}

4
source/blender/blenloader/intern/readfile.c
View File

@@ -1174,6 +1174,7 @@ static void *newmclipadr(FileData *fd, void *adr) /* used to restor
return NULL;
}
static void *newlibadr(FileData *fd, void *lib, void *adr) /* only lib data */
{
return oldnewmap_liblookup(fd->libmap, adr, lib);
@@ -1368,6 +1369,7 @@ void blo_end_movieclip_pointer_map(FileData *fd, Main *oldmain)
}
}
/* undo file support: add all library pointers in lookup */
void blo_add_library_pointer_map(ListBase *mainlist, FileData *fd)
{
@@ -8083,7 +8085,7 @@ BlendFileData *blo_read_file_internal(FileData *fd, const char *filepath)
fix_relpaths_library(fd->relabase, bfd->main); /* make all relative paths, relative to the open blend file */
link_global(fd, bfd); /* as last */
return bfd;
}

1
source/blender/imbuf/IMB_imbuf.h
View File

@@ -508,3 +508,4 @@ short imb_addtilesImBuf(struct ImBuf *ibuf);
void imb_freetilesImBuf(struct ImBuf *ibuf);
#endif

2
source/blender/makesrna/intern/rna_nodetree_types.h
View File

@@ -121,7 +121,7 @@ DefNode( CompositorNode, CMP_NODE_TRANSLATE, 0, "TRANS
DefNode( CompositorNode, CMP_NODE_ZCOMBINE, def_cmp_zcombine, "ZCOMBINE", Zcombine, "Z Combine", "" )
DefNode( CompositorNode, CMP_NODE_COMBRGBA, 0, "COMBRGBA", CombRGBA, "Combine RGBA", "" )
DefNode( CompositorNode, CMP_NODE_DILATEERODE, def_cmp_dilate_erode, "DILATEERODE", DilateErode, "Dilate/Erode", "" )
DefNode( CompositorNode, CMP_NODE_INPAINT, def_cmp_inpaint, "INPAINT", Inpaint, "Inpaint", "" )
DefNode( CompositorNode, CMP_NODE_INPAINT, def_cmp_inpaint, "INPAINT", Inpaint, "Inpaint", "" )
DefNode( CompositorNode, CMP_NODE_ROTATE, def_cmp_rotate, "ROTATE", Rotate, "Rotate", "" )
DefNode( CompositorNode, CMP_NODE_SCALE, def_cmp_scale, "SCALE", Scale, "Scale", "" )
DefNode( CompositorNode, CMP_NODE_SEPYCCA, def_cmp_ycc, "SEPYCCA", SepYCCA, "Separate YCCA", "" )