diff options
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 17 | ||||
| -rw-r--r-- | source/blender/editors/space_node/node_draw.c | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 3b69d73f7bf..febc0228707 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -11489,6 +11489,9 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } 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 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } } } - } - /* 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 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } } } + + /* 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! */ diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index 81585923728..f1261f1e6f5 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -386,7 +386,7 @@ static int node_get_colorid(bNode *node) /* 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; |