[Bf-blender-cvs] [eed26b25d2c] blender2.8: Layer collection doversion: Remove "converted from 2.7" from the name
Dalai Felinto
noreply at git.blender.org
Tue May 30 12:44:58 CEST 2017
Commit: eed26b25d2cabf39ceee76ed87fed51d03d5d360
Author: Dalai Felinto
Date: Tue May 30 12:30:04 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBeed26b25d2cabf39ceee76ed87fed51d03d5d360
Layer collection doversion: Remove "converted from 2.7" from the name
Followup and partial revert from d78b1147bed6a56dc8fbf6bc46e2e29cb7456c2e
===================================================================
M source/blender/blenloader/intern/versioning_280.c
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 672f712d861..3eeb0fc78e4 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -38,7 +38,6 @@
#include "DNA_screen_types.h"
#include "DNA_genfile.h"
-#include "BKE_blender.h"
#include "BKE_collection.h"
#include "BKE_customdata.h"
#include "BKE_idprop.h"
@@ -59,9 +58,6 @@
void do_versions_after_linking_280(Main *main)
{
if (!MAIN_VERSION_ATLEAST(main, 280, 0)) {
- char version[48];
- BKE_blender_version_string(version, sizeof(version), main->versionfile, main->subversionfile, false, false);
-
for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
/* since we don't have access to FileData we check the (always valid) first render layer instead */
if (scene->render_layers.first == NULL) {
@@ -75,7 +71,7 @@ void do_versions_after_linking_280(Main *main)
for (int i = 0; i < 20; i++) {
char name[MAX_NAME];
- BLI_snprintf(name, sizeof(collections[i]->name), "Collection %d [converted from %s]", i + 1, version);
+ BLI_snprintf(name, sizeof(collections[i]->name), "Collection %d", i + 1);
collections[i] = BKE_collection_add(scene, sc_master, name);
is_visible[i] = (scene->lay & (1 << i));
More information about the Bf-blender-cvs
mailing list