Commit: 29961ad597ce24be8c522587fa9362f84f6730fc
Author: Dalai Felinto
Date: Fri Dec 16 15:51:17 2016 +0100
Branches: render-layers
https://developer.blender.org/rB29961ad597ce24be8c522587fa9362f84f6730fc
>From review: blo_do_versions_280_after_linking >
>blo_do_versions_after_linking_280
===================================================================
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/readfile.h
M source/blender/blenloader/intern/versioning_280.c
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index 2b14b04..c63dcd3 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -8047,7 +8047,7 @@ static void do_versions(FileData *fd, Library *lib, Main
*main)
static void do_versions_after_linking(FileData *fd, Library *lib, Main *main)
{
- blo_do_versions_280_after_linking(fd, lib, main);
+ blo_do_versions_after_linking_280(fd, lib, main);
}
static void lib_link_all(FileData *fd, Main *main)
diff --git a/source/blender/blenloader/intern/readfile.h
b/source/blender/blenloader/intern/readfile.h
index 796a514..daa49d0 100644
--- a/source/blender/blenloader/intern/readfile.h
+++ b/source/blender/blenloader/intern/readfile.h
@@ -172,7 +172,7 @@ void blo_do_versions_250(struct FileData *fd, struct
Library *lib, struct Main *
void blo_do_versions_260(struct FileData *fd, struct Library *lib, struct Main
*main);
void blo_do_versions_270(struct FileData *fd, struct Library *lib, struct Main
*main);
void blo_do_versions_280(struct FileData *fd, struct Library *lib, struct Main
*main);
-void blo_do_versions_280_after_linking(struct FileData *fd, struct Library
*lib, struct Main *main);
+void blo_do_versions_after_linking_280(struct FileData *fd, struct Library
*lib, struct Main *main);
#endif
diff --git a/source/blender/blenloader/intern/versioning_280.c
b/source/blender/blenloader/intern/versioning_280.c
index ae39173..1835801 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -46,7 +46,7 @@
#include "MEM_guardedalloc.h"
-void blo_do_versions_280_after_linking(FileData *fd, Library *UNUSED(lib),
Main *main)
+void blo_do_versions_after_linking_280(FileData *fd, Library *UNUSED(lib),
Main *main)
{
if (!MAIN_VERSION_ATLEAST(main, 280, 0)) {
if (!DNA_struct_elem_find(fd->filesdna, "Scene", "ListBase",
"render_layers")) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs