blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Layer collection doversion: Remove "converted from 2.7" from the name 

Followup and partial revert from d78b1147be
This commit is contained in:
Dalai Felinto 2017-05-30 12:30:04 +02:00
parent d888453244
commit eed26b25d2
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenloader/intern/versioning_280.c
View File

@ -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));