[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35471] trunk/blender/source/blender: move do_version code under latest subversion bump.

[Campbell Barton]

Revision: 35471
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35471
Author:   campbellbarton
Date:     2011-03-11 09:35:16 +0000 (Fri, 11 Mar 2011)
Log Message:
-----------
move do_version code under latest subversion bump.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/editors/space_node/node_draw.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2011-03-11 07:59:43 UTC (rev 35470)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2011-03-11 09:35:16 UTC (rev 35471)
@@ -11489,6 +11489,9 @@
 	}
 
 	if (main->versionfile < 256 || (main->versionfile == 256 && main->subversionfile <3)){
+		bScreen *sc;
+		Brush *brush;
+		Object *ob;
 
 		Material *mat;
 		int tex_nr, transp_tex;
@@ -11509,15 +11512,7 @@
 				}
 			}
 		}
-	}
 
-	/* put compatibility code here until next subversion bump */
-
-	{
-		bScreen *sc;
-		Brush *brush;
-		Object *ob;
-		
 		/* redraws flag in SpaceTime has been moved to Screen level */
 		for (sc = main->screen.first; sc; sc= sc->id.next) {
 			if (sc->redraws_flag == 0) {
@@ -11546,6 +11541,12 @@
 			}
 		}
 	}
+
+	/* put compatibility code here until next subversion bump */
+
+	{
+
+	}
 	
 	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
 	/* WATCH IT 2!: Userdef struct init has to be in editors/interface/resources.c! */

Modified: trunk/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_draw.c	2011-03-11 07:59:43 UTC (rev 35470)
+++ trunk/blender/source/blender/editors/space_node/node_draw.c	2011-03-11 09:35:16 UTC (rev 35471)
@@ -386,7 +386,7 @@
 /* based on settings in node, sets drawing rect info. each redraw! */
 /* note: this assumes only 1 group at a time is drawn (linked data) */
 /* in node->totr the entire boundbox for the group is stored */
-static void node_update_group(const bContext *C, bNodeTree *ntree, bNode *gnode)
+static void node_update_group(const bContext *C, bNodeTree *UNUSED(ntree), bNode *gnode)
 {
 	bNodeTree *ngroup= (bNodeTree *)gnode->id;
 	bNode *node;