diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-13 17:42:56 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-13 17:42:56 +0300 |
commit | 4943739b89c010f08ddcc7bc02bf04acf7f0bc8d (patch) | |
tree | 38674282286ec72693929b481d9aa3643da8b746 /source/blender/blenloader | |
parent | b8015ece51c22224265c55196eff61a8f33d7239 (diff) | |
parent | f61c30f804e36bf00e7124514f02bbee42e0197d (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh_utils.c
source/blenderplayer/bad_level_call_stubs/stubs.c
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 8 | ||||
-rw-r--r-- | source/blender/blenloader/intern/writefile.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 8807cbc1d21..2ec1aab3725 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4531,12 +4531,12 @@ static void lib_link_mesh(FileData *fd, Main *main) if (me->totface && !me->totpoly) { /* temporarily switch main so that reading from * external CustomData works */ - Main *gmain = G.main; - G.main = main; + Main *gmain = G_MAIN; + G_MAIN = main; BKE_mesh_do_versions_convert_mfaces_to_mpolys(me); - G.main = gmain; + G_MAIN = gmain; } /* @@ -10336,7 +10336,7 @@ static Main *library_link_begin(Main *mainvar, FileData **fd, const char *filepa /** * Initialize the BlendHandle for linking library data. * - * \param mainvar The current main database, e.g. G.main or CTX_data_main(C). + * \param mainvar The current main database, e.g. G_MAIN or CTX_data_main(C). * \param bh A blender file handle as returned by \a BLO_blendhandle_from_file or \a BLO_blendhandle_from_memory. * \param filepath Used for relative linking, copied to the \a lib->name. * \return the library Main, to be passed to \a BLO_library_append_named_part as \a mainl. diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 6abcf6cfa02..71b13133230 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -4091,7 +4091,7 @@ bool BLO_write_file( if (G.relbase_valid) { /* blend may not have been saved before. Tn this case * we should not have any relative paths, but if there - * is somehow, an invalid or empty G.main->name it will + * is somehow, an invalid or empty G_MAIN->name it will * print an error, don't try make the absolute in this case. */ BKE_bpath_absolute_convert(mainvar, BKE_main_blendfile_path_from_global(), NULL); } @@ -4099,7 +4099,7 @@ bool BLO_write_file( } if (write_flags & G_FILE_RELATIVE_REMAP) { - /* note, making relative to something OTHER then G.main->name */ + /* note, making relative to something OTHER then G_MAIN->name */ BKE_bpath_relative_convert(mainvar, filepath, NULL); } |