[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49620] branches/soc-2011-tomato/source/ blender: misc small edits syncing with trunk

[Campbell Barton]

Revision: 49620
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49620
Author:   campbellbarton
Date:     2012-08-06 13:59:11 +0000 (Mon, 06 Aug 2012)
Log Message:
-----------
misc small edits syncing with trunk

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-tomato/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree_types.h

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c	2012-08-06 13:53:38 UTC (rev 49619)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c	2012-08-06 13:59:11 UTC (rev 49620)
@@ -1528,7 +1528,6 @@
 	MEM_freeN(masklay);
 }
 
-
 void BKE_mask_layer_free_list(ListBase *masklayers)
 {
 	MaskLayer *masklay = masklayers->first;
@@ -1541,7 +1540,6 @@
 
 		masklay = masklay_next;
 	}
-
 }
 
 void BKE_mask_free(Mask *mask)

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c	2012-08-06 13:53:38 UTC (rev 49619)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c	2012-08-06 13:59:11 UTC (rev 49620)
@@ -1443,13 +1443,13 @@
 	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);
 	}

Modified: branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c	2012-08-06 13:53:38 UTC (rev 49619)
+++ branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c	2012-08-06 13:59:11 UTC (rev 49620)
@@ -1174,6 +1174,7 @@
 	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 @@
 	}
 }
 
+
 /* undo file support: add all library pointers in lookup */
 void blo_add_library_pointer_map(ListBase *mainlist, FileData *fd)
 {
@@ -8083,7 +8085,7 @@
 	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;
 }
 

Modified: branches/soc-2011-tomato/source/blender/imbuf/IMB_imbuf.h
===================================================================
--- branches/soc-2011-tomato/source/blender/imbuf/IMB_imbuf.h	2012-08-06 13:53:38 UTC (rev 49619)
+++ branches/soc-2011-tomato/source/blender/imbuf/IMB_imbuf.h	2012-08-06 13:59:11 UTC (rev 49620)
@@ -508,3 +508,4 @@
 void imb_freetilesImBuf(struct ImBuf *ibuf);
 
 #endif
+

Modified: branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree_types.h
===================================================================
--- branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree_types.h	2012-08-06 13:53:38 UTC (rev 49619)
+++ branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree_types.h	2012-08-06 13:59:11 UTC (rev 49620)
@@ -121,7 +121,7 @@
 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",     ""              )