misc small edits syncing with trunk
authorCampbell Barton <ideasman42@gmail.com>
Mon, 6 Aug 2012 13:59:11 +0000 (13:59 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 6 Aug 2012 13:59:11 +0000 (13:59 +0000)
source/blender/blenkernel/intern/mask.c
source/blender/blenkernel/intern/node.c
source/blender/blenloader/intern/readfile.c
source/blender/imbuf/IMB_imbuf.h
source/blender/makesrna/intern/rna_nodetree_types.h

index 01aa9fa9fa9fe05344c17775202cae28d84d1fb2..f41d8feef0b3c2d849559695cad5cb7d297dd771 100644 (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)
index 8f3c76c33571b4893ed23f7d0f64069764af090a..8670f86cd678d8f477bb53c2a1b8d0cb32d072ad 100644 (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);
        }
index 890cb0e1ed0095178702492314bee7fc211208e4..e1095d25b1da20929bdc2df3ad6b41ce012c8d2b 100644 (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;
 }
 
index 50fa8ad1106cd9e13b941edcb51de2f273021f27..99db8bbfa0a46faf4c2033c7c3880d94cb742366 100644 (file)
@@ -508,3 +508,4 @@ short imb_addtilesImBuf(struct ImBuf *ibuf);
 void imb_freetilesImBuf(struct ImBuf *ibuf);
 
 #endif
+
index 494f147f6d9e203050d4ab18022c0f5590b3e956..c70dd01cd57b1a20f22e1d06f4d8d488a72fbb45 100644 (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",     ""              )