2020-04-16 18:10:21 +10:00
|
|
|
/*
|
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
|
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/** \file
|
|
|
|
|
* \ingroup blenloader
|
|
|
|
|
*/
|
|
|
|
|
/* allow readfile to use deprecated functionality */
|
|
|
|
|
#define DNA_DEPRECATED_ALLOW
|
|
|
|
|
|
|
|
|
|
#include "BLI_listbase.h"
|
2020-07-13 01:44:24 +02:00
|
|
|
#include "BLI_math.h"
|
2020-08-03 03:28:04 +02:00
|
|
|
#include "BLI_string.h"
|
2020-04-16 18:10:21 +10:00
|
|
|
#include "BLI_utildefines.h"
|
|
|
|
|
|
2020-09-15 10:41:08 +02:00
|
|
|
#include "DNA_anim_types.h"
|
2020-05-07 15:02:21 +02:00
|
|
|
#include "DNA_brush_types.h"
|
2020-08-03 03:28:04 +02:00
|
|
|
#include "DNA_cachefile_types.h"
|
2020-06-19 12:40:48 -04:00
|
|
|
#include "DNA_constraint_types.h"
|
2020-04-17 13:53:15 +10:00
|
|
|
#include "DNA_genfile.h"
|
2020-05-26 12:04:16 +02:00
|
|
|
#include "DNA_gpencil_modifier_types.h"
|
2020-08-06 17:27:45 +02:00
|
|
|
#include "DNA_gpencil_types.h"
|
2020-08-04 12:52:04 +02:00
|
|
|
#include "DNA_hair_types.h"
|
2020-09-16 12:26:16 +02:00
|
|
|
#include "DNA_mesh_types.h"
|
2020-09-17 11:10:58 -03:00
|
|
|
#include "DNA_meshdata_types.h"
|
2020-05-26 20:53:38 +02:00
|
|
|
#include "DNA_modifier_types.h"
|
|
|
|
|
#include "DNA_object_types.h"
|
2020-08-04 12:52:04 +02:00
|
|
|
#include "DNA_pointcloud_types.h"
|
2020-09-02 14:14:47 +02:00
|
|
|
#include "DNA_rigidbody_types.h"
|
2020-04-16 18:10:21 +10:00
|
|
|
#include "DNA_screen_types.h"
|
2020-06-19 15:07:13 -04:00
|
|
|
#include "DNA_shader_fx_types.h"
|
2020-09-30 14:49:42 +02:00
|
|
|
#include "DNA_workspace_types.h"
|
2020-04-16 18:10:21 +10:00
|
|
|
|
|
|
|
|
#include "BKE_collection.h"
|
2020-05-07 15:02:21 +02:00
|
|
|
#include "BKE_colortools.h"
|
2020-08-06 17:27:45 +02:00
|
|
|
#include "BKE_gpencil.h"
|
2020-05-15 17:53:03 +10:00
|
|
|
#include "BKE_lib_id.h"
|
2020-04-16 18:10:21 +10:00
|
|
|
#include "BKE_main.h"
|
2020-09-17 11:10:58 -03:00
|
|
|
#include "BKE_mesh.h"
|
2020-07-13 01:44:24 +02:00
|
|
|
#include "BKE_node.h"
|
2020-04-16 18:10:21 +10:00
|
|
|
|
2020-09-16 12:26:16 +02:00
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
|
|
2020-04-16 18:10:21 +10:00
|
|
|
#include "BLO_readfile.h"
|
|
|
|
|
#include "readfile.h"
|
|
|
|
|
|
|
|
|
|
/* Make preferences read-only, use versioning_userdef.c. */
|
|
|
|
|
#define U (*((const UserDef *)&U))
|
|
|
|
|
|
2020-05-26 12:04:16 +02:00
|
|
|
void do_versions_after_linking_290(Main *bmain, ReportList *UNUSED(reports))
|
|
|
|
|
{
|
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 290, 1)) {
|
|
|
|
|
/* Patch old grease pencil modifiers material filter. */
|
|
|
|
|
LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
|
|
|
|
|
LISTBASE_FOREACH (GpencilModifierData *, md, &ob->greasepencil_modifiers) {
|
|
|
|
|
switch (md->type) {
|
|
|
|
|
case eGpencilModifierType_Array: {
|
|
|
|
|
ArrayGpencilModifierData *gpmd = (ArrayGpencilModifierData *)md;
|
|
|
|
|
if (gpmd->materialname[0] != '\0') {
|
|
|
|
|
gpmd->material = BLI_findstring(
|
|
|
|
|
&bmain->materials, gpmd->materialname, offsetof(ID, name) + 2);
|
|
|
|
|
gpmd->materialname[0] = '\0';
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case eGpencilModifierType_Color: {
|
|
|
|
|
ColorGpencilModifierData *gpmd = (ColorGpencilModifierData *)md;
|
|
|
|
|
if (gpmd->materialname[0] != '\0') {
|
|
|
|
|
gpmd->material = BLI_findstring(
|
|
|
|
|
&bmain->materials, gpmd->materialname, offsetof(ID, name) + 2);
|
|
|
|
|
gpmd->materialname[0] = '\0';
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case eGpencilModifierType_Hook: {
|
|
|
|
|
HookGpencilModifierData *gpmd = (HookGpencilModifierData *)md;
|
|
|
|
|
if (gpmd->materialname[0] != '\0') {
|
|
|
|
|
gpmd->material = BLI_findstring(
|
|
|
|
|
&bmain->materials, gpmd->materialname, offsetof(ID, name) + 2);
|
|
|
|
|
gpmd->materialname[0] = '\0';
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case eGpencilModifierType_Lattice: {
|
|
|
|
|
LatticeGpencilModifierData *gpmd = (LatticeGpencilModifierData *)md;
|
|
|
|
|
if (gpmd->materialname[0] != '\0') {
|
|
|
|
|
gpmd->material = BLI_findstring(
|
|
|
|
|
&bmain->materials, gpmd->materialname, offsetof(ID, name) + 2);
|
|
|
|
|
gpmd->materialname[0] = '\0';
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case eGpencilModifierType_Mirror: {
|
|
|
|
|
MirrorGpencilModifierData *gpmd = (MirrorGpencilModifierData *)md;
|
|
|
|
|
if (gpmd->materialname[0] != '\0') {
|
|
|
|
|
gpmd->material = BLI_findstring(
|
|
|
|
|
&bmain->materials, gpmd->materialname, offsetof(ID, name) + 2);
|
|
|
|
|
gpmd->materialname[0] = '\0';
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case eGpencilModifierType_Multiply: {
|
|
|
|
|
MultiplyGpencilModifierData *gpmd = (MultiplyGpencilModifierData *)md;
|
|
|
|
|
if (gpmd->materialname[0] != '\0') {
|
|
|
|
|
gpmd->material = BLI_findstring(
|
|
|
|
|
&bmain->materials, gpmd->materialname, offsetof(ID, name) + 2);
|
|
|
|
|
gpmd->materialname[0] = '\0';
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case eGpencilModifierType_Noise: {
|
|
|
|
|
NoiseGpencilModifierData *gpmd = (NoiseGpencilModifierData *)md;
|
|
|
|
|
if (gpmd->materialname[0] != '\0') {
|
|
|
|
|
gpmd->material = BLI_findstring(
|
|
|
|
|
&bmain->materials, gpmd->materialname, offsetof(ID, name) + 2);
|
|
|
|
|
gpmd->materialname[0] = '\0';
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case eGpencilModifierType_Offset: {
|
|
|
|
|
OffsetGpencilModifierData *gpmd = (OffsetGpencilModifierData *)md;
|
|
|
|
|
if (gpmd->materialname[0] != '\0') {
|
|
|
|
|
gpmd->material = BLI_findstring(
|
|
|
|
|
&bmain->materials, gpmd->materialname, offsetof(ID, name) + 2);
|
|
|
|
|
gpmd->materialname[0] = '\0';
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case eGpencilModifierType_Opacity: {
|
|
|
|
|
OpacityGpencilModifierData *gpmd = (OpacityGpencilModifierData *)md;
|
|
|
|
|
if (gpmd->materialname[0] != '\0') {
|
|
|
|
|
gpmd->material = BLI_findstring(
|
|
|
|
|
&bmain->materials, gpmd->materialname, offsetof(ID, name) + 2);
|
|
|
|
|
gpmd->materialname[0] = '\0';
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case eGpencilModifierType_Simplify: {
|
|
|
|
|
SimplifyGpencilModifierData *gpmd = (SimplifyGpencilModifierData *)md;
|
|
|
|
|
if (gpmd->materialname[0] != '\0') {
|
|
|
|
|
gpmd->material = BLI_findstring(
|
|
|
|
|
&bmain->materials, gpmd->materialname, offsetof(ID, name) + 2);
|
|
|
|
|
gpmd->materialname[0] = '\0';
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case eGpencilModifierType_Smooth: {
|
|
|
|
|
SmoothGpencilModifierData *gpmd = (SmoothGpencilModifierData *)md;
|
|
|
|
|
if (gpmd->materialname[0] != '\0') {
|
|
|
|
|
gpmd->material = BLI_findstring(
|
|
|
|
|
&bmain->materials, gpmd->materialname, offsetof(ID, name) + 2);
|
|
|
|
|
gpmd->materialname[0] = '\0';
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case eGpencilModifierType_Subdiv: {
|
|
|
|
|
SubdivGpencilModifierData *gpmd = (SubdivGpencilModifierData *)md;
|
|
|
|
|
if (gpmd->materialname[0] != '\0') {
|
|
|
|
|
gpmd->material = BLI_findstring(
|
|
|
|
|
&bmain->materials, gpmd->materialname, offsetof(ID, name) + 2);
|
|
|
|
|
gpmd->materialname[0] = '\0';
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case eGpencilModifierType_Texture: {
|
|
|
|
|
TextureGpencilModifierData *gpmd = (TextureGpencilModifierData *)md;
|
|
|
|
|
if (gpmd->materialname[0] != '\0') {
|
|
|
|
|
gpmd->material = BLI_findstring(
|
|
|
|
|
&bmain->materials, gpmd->materialname, offsetof(ID, name) + 2);
|
|
|
|
|
gpmd->materialname[0] = '\0';
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case eGpencilModifierType_Thick: {
|
|
|
|
|
ThickGpencilModifierData *gpmd = (ThickGpencilModifierData *)md;
|
|
|
|
|
if (gpmd->materialname[0] != '\0') {
|
|
|
|
|
gpmd->material = BLI_findstring(
|
|
|
|
|
&bmain->materials, gpmd->materialname, offsetof(ID, name) + 2);
|
|
|
|
|
gpmd->materialname[0] = '\0';
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-08-06 17:27:45 +02:00
|
|
|
|
|
|
|
|
/* Patch first frame for old files. */
|
|
|
|
|
Scene *scene = bmain->scenes.first;
|
2020-08-18 08:36:26 +02:00
|
|
|
if (scene != NULL) {
|
|
|
|
|
LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
|
|
|
|
|
if (ob->type != OB_GPENCIL) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
bGPdata *gpd = ob->data;
|
|
|
|
|
LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
|
|
|
|
|
bGPDframe *gpf = gpl->frames.first;
|
|
|
|
|
if (gpf && gpf->framenum > scene->r.sfra) {
|
|
|
|
|
bGPDframe *gpf_dup = BKE_gpencil_frame_duplicate(gpf);
|
|
|
|
|
gpf_dup->framenum = scene->r.sfra;
|
|
|
|
|
BLI_addhead(&gpl->frames, gpf_dup);
|
|
|
|
|
}
|
2020-08-06 17:27:45 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-05-26 12:04:16 +02:00
|
|
|
}
|
|
|
|
|
|
2020-08-19 11:37:21 -04:00
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 291, 1)) {
|
|
|
|
|
LISTBASE_FOREACH (Collection *, collection, &bmain->collections) {
|
|
|
|
|
if (BKE_collection_cycles_fix(bmain, collection)) {
|
|
|
|
|
printf(
|
|
|
|
|
"WARNING: Cycle detected in collection '%s', fixed as best as possible.\n"
|
|
|
|
|
"You may have to reconstruct your View Layers...\n",
|
|
|
|
|
collection->id.name);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-05-26 12:04:16 +02:00
|
|
|
/**
|
|
|
|
|
* Versioning code until next subversion bump goes here.
|
|
|
|
|
*
|
|
|
|
|
* \note Be sure to check when bumping the version:
|
|
|
|
|
* - #blo_do_versions_290 in this file.
|
2020-10-02 23:36:05 +10:00
|
|
|
* - "versioning_userdef.c", #blo_do_versions_userdef
|
2020-05-26 12:04:16 +02:00
|
|
|
* - "versioning_userdef.c", #do_versions_theme
|
|
|
|
|
*
|
|
|
|
|
* \note Keep this message at the bottom of the function.
|
|
|
|
|
*/
|
|
|
|
|
{
|
2020-08-19 11:37:21 -04:00
|
|
|
|
2020-05-26 12:04:16 +02:00
|
|
|
/* Keep this block, even when empty. */
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-08-19 11:37:21 -04:00
|
|
|
static void panels_remove_x_closed_flag_recursive(Panel *panel)
|
|
|
|
|
{
|
|
|
|
|
const bool was_closed_x = panel->flag & PNL_UNUSED_1;
|
|
|
|
|
const bool was_closed_y = panel->flag & PNL_CLOSED; /* That value was the Y closed flag. */
|
|
|
|
|
|
|
|
|
|
SET_FLAG_FROM_TEST(panel->flag, was_closed_x || was_closed_y, PNL_CLOSED);
|
|
|
|
|
|
|
|
|
|
/* Clear the old PNL_CLOSEDX flag. */
|
|
|
|
|
panel->flag &= ~PNL_UNUSED_1;
|
|
|
|
|
|
|
|
|
|
LISTBASE_FOREACH (Panel *, child_panel, &panel->children) {
|
|
|
|
|
panels_remove_x_closed_flag_recursive(child_panel);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-08-04 12:52:04 +02:00
|
|
|
static void do_versions_point_attributes(CustomData *pdata)
|
|
|
|
|
{
|
|
|
|
|
/* Change to generic named float/float3 attributes. */
|
|
|
|
|
const int CD_LOCATION = 43;
|
|
|
|
|
const int CD_RADIUS = 44;
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < pdata->totlayer; i++) {
|
|
|
|
|
CustomDataLayer *layer = &pdata->layers[i];
|
|
|
|
|
if (layer->type == CD_LOCATION) {
|
|
|
|
|
STRNCPY(layer->name, "Position");
|
|
|
|
|
layer->type = CD_PROP_FLOAT3;
|
|
|
|
|
}
|
|
|
|
|
else if (layer->type == CD_RADIUS) {
|
|
|
|
|
STRNCPY(layer->name, "Radius");
|
|
|
|
|
layer->type = CD_PROP_FLOAT;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-15 10:41:08 +02:00
|
|
|
/* Move FCurve handles towards the control point in such a way that the curve itself doesn't
|
|
|
|
|
* change. Since 2.91 FCurves are computed slightly differently, which requires this update to keep
|
|
|
|
|
* the same animation result. Previous versions scaled down overlapping handles during evaluation.
|
|
|
|
|
* This function applies the old correction to the actual animation data instead. */
|
|
|
|
|
static void do_versions_291_fcurve_handles_limit(FCurve *fcu)
|
|
|
|
|
{
|
|
|
|
|
uint i = 1;
|
|
|
|
|
for (BezTriple *bezt = fcu->bezt; i < fcu->totvert; i++, bezt++) {
|
|
|
|
|
/* Only adjust bezier keyframes. */
|
|
|
|
|
if (bezt->ipo != BEZT_IPO_BEZ) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BezTriple *nextbezt = bezt + 1;
|
|
|
|
|
const float v1[2] = {bezt->vec[1][0], bezt->vec[1][1]};
|
|
|
|
|
const float v2[2] = {bezt->vec[2][0], bezt->vec[2][1]};
|
|
|
|
|
const float v3[2] = {nextbezt->vec[0][0], nextbezt->vec[0][1]};
|
|
|
|
|
const float v4[2] = {nextbezt->vec[1][0], nextbezt->vec[1][1]};
|
|
|
|
|
|
|
|
|
|
/* If the handles have no length, no need to do any corrections. */
|
|
|
|
|
if (v1[0] == v2[0] && v3[0] == v4[0]) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Calculate handle deltas. */
|
|
|
|
|
float delta1[2], delta2[2];
|
|
|
|
|
sub_v2_v2v2(delta1, v1, v2);
|
|
|
|
|
sub_v2_v2v2(delta2, v4, v3);
|
|
|
|
|
|
|
|
|
|
const float len1 = fabsf(delta1[0]); /* Length of handle of first key. */
|
|
|
|
|
const float len2 = fabsf(delta2[0]); /* Length of handle of second key. */
|
|
|
|
|
|
|
|
|
|
/* Overlapping handles used to be internally scaled down in previous versions.
|
|
|
|
|
* We bake the handles onto these previously virtual values. */
|
|
|
|
|
const float time_delta = v4[0] - v1[0];
|
|
|
|
|
const float total_len = len1 + len2;
|
|
|
|
|
if (total_len <= time_delta) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const float factor = time_delta / total_len;
|
|
|
|
|
/* Current keyframe's right handle: */
|
|
|
|
|
madd_v2_v2v2fl(bezt->vec[2], v1, delta1, -factor); /* vec[2] = v1 - factor * delta1 */
|
|
|
|
|
/* Next keyframe's left handle: */
|
|
|
|
|
madd_v2_v2v2fl(nextbezt->vec[0], v4, delta2, -factor); /* vec[0] = v4 - factor * delta2 */
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-04-16 18:10:21 +10:00
|
|
|
void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
|
|
|
|
|
{
|
|
|
|
|
UNUSED_VARS(fd);
|
2020-05-15 17:53:03 +10:00
|
|
|
|
2020-09-17 11:10:58 -03:00
|
|
|
if (MAIN_VERSION_ATLEAST(bmain, 290, 2) && MAIN_VERSION_OLDER(bmain, 291, 1)) {
|
|
|
|
|
/* In this range, the extrude manifold could generate meshes with degenerated face. */
|
|
|
|
|
LISTBASE_FOREACH (Mesh *, me, &bmain->meshes) {
|
|
|
|
|
for (MPoly *mp = me->mpoly, *mp_end = mp + me->totpoly; mp < mp_end; mp++) {
|
|
|
|
|
if (mp->totloop == 2) {
|
|
|
|
|
bool changed;
|
|
|
|
|
BKE_mesh_validate_arrays(me,
|
|
|
|
|
me->mvert,
|
|
|
|
|
me->totvert,
|
|
|
|
|
me->medge,
|
|
|
|
|
me->totedge,
|
|
|
|
|
me->mface,
|
|
|
|
|
me->totface,
|
|
|
|
|
me->mloop,
|
|
|
|
|
me->totloop,
|
|
|
|
|
me->mpoly,
|
|
|
|
|
me->totpoly,
|
|
|
|
|
me->dvert,
|
|
|
|
|
false,
|
|
|
|
|
true,
|
|
|
|
|
&changed);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-05-15 17:53:03 +10:00
|
|
|
/** Repair files from duplicate brushes added to blend files, see: T76738. */
|
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 290, 2)) {
|
|
|
|
|
{
|
|
|
|
|
short id_codes[] = {ID_BR, ID_PAL};
|
|
|
|
|
for (int i = 0; i < ARRAY_SIZE(id_codes); i++) {
|
|
|
|
|
ListBase *lb = which_libbase(bmain, id_codes[i]);
|
|
|
|
|
BKE_main_id_repair_duplicate_names_listbase(lb);
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-04-16 18:10:21 +10:00
|
|
|
|
2020-04-17 13:53:15 +10:00
|
|
|
if (!DNA_struct_elem_find(fd->filesdna, "SpaceImage", "float", "uv_opacity")) {
|
|
|
|
|
for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
|
|
|
|
|
LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
|
|
|
|
|
LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
|
|
|
|
|
if (sl->spacetype == SPACE_IMAGE) {
|
|
|
|
|
SpaceImage *sima = (SpaceImage *)sl;
|
|
|
|
|
sima->uv_opacity = 1.0f;
|
|
|
|
|
}
|
2020-04-16 18:10:21 +10:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-05-07 15:02:21 +02:00
|
|
|
|
|
|
|
|
/* Init Grease Pencil new random curves. */
|
|
|
|
|
if (!DNA_struct_elem_find(fd->filesdna, "BrushGpencilSettings", "float", "random_hue")) {
|
|
|
|
|
LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) {
|
|
|
|
|
if ((brush->gpencil_settings) && (brush->gpencil_settings->curve_rand_pressure == NULL)) {
|
|
|
|
|
brush->gpencil_settings->curve_rand_pressure = BKE_curvemapping_add(
|
|
|
|
|
1, 0.0f, 0.0f, 1.0f, 1.0f);
|
|
|
|
|
brush->gpencil_settings->curve_rand_strength = BKE_curvemapping_add(
|
|
|
|
|
1, 0.0f, 0.0f, 1.0f, 1.0f);
|
|
|
|
|
brush->gpencil_settings->curve_rand_uv = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
|
|
|
|
|
brush->gpencil_settings->curve_rand_hue = BKE_curvemapping_add(
|
|
|
|
|
1, 0.0f, 0.0f, 1.0f, 1.0f);
|
|
|
|
|
brush->gpencil_settings->curve_rand_saturation = BKE_curvemapping_add(
|
|
|
|
|
1, 0.0f, 0.0f, 1.0f, 1.0f);
|
|
|
|
|
brush->gpencil_settings->curve_rand_value = BKE_curvemapping_add(
|
|
|
|
|
1, 0.0f, 0.0f, 1.0f, 1.0f);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-04-16 18:10:21 +10:00
|
|
|
}
|
2020-05-15 17:53:03 +10:00
|
|
|
|
2020-05-26 20:53:38 +02:00
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 290, 4)) {
|
2020-06-05 14:34:00 +10:00
|
|
|
/* Clear old deprecated bit-flag from edit weights modifiers, we now use it for something else.
|
2020-05-26 20:53:38 +02:00
|
|
|
*/
|
|
|
|
|
LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
|
|
|
|
|
LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) {
|
|
|
|
|
if (md->type == eModifierType_WeightVGEdit) {
|
2020-06-02 17:19:54 +02:00
|
|
|
((WeightVGEditModifierData *)md)->edit_flags &= ~MOD_WVG_EDIT_WEIGHTS_NORMALIZE;
|
2020-05-26 20:53:38 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-07-13 01:44:24 +02:00
|
|
|
|
|
|
|
|
/* Initialize parameters of the new Nishita sky model. */
|
|
|
|
|
if (!DNA_struct_elem_find(fd->filesdna, "NodeTexSky", "float", "sun_size")) {
|
|
|
|
|
FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
|
|
|
|
|
if (ntree->type == NTREE_SHADER) {
|
|
|
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
|
|
|
if (node->type == SH_NODE_TEX_SKY && node->storage) {
|
|
|
|
|
NodeTexSky *tex = (NodeTexSky *)node->storage;
|
|
|
|
|
tex->sun_disc = true;
|
|
|
|
|
tex->sun_size = DEG2RADF(0.545);
|
|
|
|
|
tex->sun_elevation = M_PI_2;
|
|
|
|
|
tex->sun_rotation = 0.0f;
|
|
|
|
|
tex->altitude = 0.0f;
|
|
|
|
|
tex->air_density = 1.0f;
|
|
|
|
|
tex->dust_density = 1.0f;
|
|
|
|
|
tex->ozone_density = 1.0f;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
FOREACH_NODETREE_END;
|
|
|
|
|
}
|
2020-05-26 20:53:38 +02:00
|
|
|
}
|
|
|
|
|
|
2020-07-03 10:28:13 -04:00
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 290, 6)) {
|
2020-06-25 23:13:02 +10:00
|
|
|
/* Transition to saving expansion for all of a modifier's sub-panels. */
|
2020-06-05 10:41:03 -04:00
|
|
|
if (!DNA_struct_elem_find(fd->filesdna, "ModifierData", "short", "ui_expand_flag")) {
|
|
|
|
|
for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) {
|
|
|
|
|
LISTBASE_FOREACH (ModifierData *, md, &object->modifiers) {
|
|
|
|
|
if (md->mode & eModifierMode_Expanded_DEPRECATED) {
|
|
|
|
|
md->ui_expand_flag = 1;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
md->ui_expand_flag = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-06-19 17:02:55 +02:00
|
|
|
|
|
|
|
|
/* EEVEE Motion blur new parameters. */
|
|
|
|
|
if (!DNA_struct_elem_find(fd->filesdna, "SceneEEVEE", "float", "motion_blur_depth_scale")) {
|
|
|
|
|
LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
|
|
|
|
|
scene->eevee.motion_blur_depth_scale = 100.0f;
|
|
|
|
|
scene->eevee.motion_blur_max = 32;
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-06-19 12:40:48 -04:00
|
|
|
|
2020-06-23 13:59:55 +02:00
|
|
|
if (!DNA_struct_elem_find(fd->filesdna, "SceneEEVEE", "int", "motion_blur_steps")) {
|
|
|
|
|
LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
|
|
|
|
|
scene->eevee.motion_blur_steps = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-06-25 23:13:02 +10:00
|
|
|
/* Transition to saving expansion for all of a constraint's sub-panels. */
|
2020-06-19 12:40:48 -04:00
|
|
|
if (!DNA_struct_elem_find(fd->filesdna, "bConstraint", "short", "ui_expand_flag")) {
|
|
|
|
|
for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) {
|
|
|
|
|
LISTBASE_FOREACH (bConstraint *, con, &object->constraints) {
|
|
|
|
|
if (con->flag & CONSTRAINT_EXPAND_DEPRECATED) {
|
|
|
|
|
con->ui_expand_flag = 1;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
con->ui_expand_flag = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-06-19 14:42:08 -04:00
|
|
|
|
2020-06-25 23:13:02 +10:00
|
|
|
/* Transition to saving expansion for all of grease pencil modifier's sub-panels. */
|
2020-06-19 14:42:08 -04:00
|
|
|
if (!DNA_struct_elem_find(fd->filesdna, "GpencilModifierData", "short", "ui_expand_flag")) {
|
|
|
|
|
for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) {
|
|
|
|
|
LISTBASE_FOREACH (GpencilModifierData *, md, &object->greasepencil_modifiers) {
|
|
|
|
|
if (md->mode & eGpencilModifierMode_Expanded_DEPRECATED) {
|
|
|
|
|
md->ui_expand_flag = 1;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
md->ui_expand_flag = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-06-19 15:07:13 -04:00
|
|
|
|
2020-06-25 23:13:02 +10:00
|
|
|
/* Transition to saving expansion for all of an effect's sub-panels. */
|
2020-06-19 15:07:13 -04:00
|
|
|
if (!DNA_struct_elem_find(fd->filesdna, "ShaderFxData", "short", "ui_expand_flag")) {
|
|
|
|
|
for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) {
|
|
|
|
|
LISTBASE_FOREACH (ShaderFxData *, fx, &object->shader_fx) {
|
|
|
|
|
if (fx->mode & eShaderFxMode_Expanded_DEPRECATED) {
|
|
|
|
|
fx->ui_expand_flag = 1;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
fx->ui_expand_flag = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-06-22 22:25:55 -04:00
|
|
|
|
2020-07-03 10:28:13 -04:00
|
|
|
/* Refactor bevel profile type to use an enum. */
|
|
|
|
|
if (!DNA_struct_elem_find(fd->filesdna, "BevelModifierData", "short", "profile_type")) {
|
|
|
|
|
for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) {
|
|
|
|
|
LISTBASE_FOREACH (ModifierData *, md, &object->modifiers) {
|
|
|
|
|
if (md->type == eModifierType_Bevel) {
|
|
|
|
|
BevelModifierData *bmd = (BevelModifierData *)md;
|
|
|
|
|
bool use_custom_profile = bmd->flags & MOD_BEVEL_CUSTOM_PROFILE_DEPRECATED;
|
|
|
|
|
bmd->profile_type = use_custom_profile ? MOD_BEVEL_PROFILE_CUSTOM :
|
|
|
|
|
MOD_BEVEL_PROFILE_SUPERELLIPSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Change ocean modifier values from [0, 10] to [0, 1] ranges. */
|
2020-06-22 22:25:55 -04:00
|
|
|
for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) {
|
|
|
|
|
LISTBASE_FOREACH (ModifierData *, md, &object->modifiers) {
|
2020-07-03 10:28:13 -04:00
|
|
|
if (md->type == eModifierType_Ocean) {
|
|
|
|
|
OceanModifierData *omd = (OceanModifierData *)md;
|
|
|
|
|
omd->wave_alignment *= 0.1f;
|
|
|
|
|
omd->sharpen_peak_jonswap *= 0.1f;
|
2020-06-22 22:25:55 -04:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-07-03 10:28:13 -04:00
|
|
|
|
2020-08-19 11:37:21 -04:00
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 291, 1)) {
|
2020-07-13 01:49:25 +02:00
|
|
|
|
|
|
|
|
/* Initialize additional parameter of the Nishita sky model and change altitude unit. */
|
|
|
|
|
if (!DNA_struct_elem_find(fd->filesdna, "NodeTexSky", "float", "sun_intensity")) {
|
|
|
|
|
FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
|
|
|
|
|
if (ntree->type == NTREE_SHADER) {
|
|
|
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
|
|
|
if (node->type == SH_NODE_TEX_SKY && node->storage) {
|
|
|
|
|
NodeTexSky *tex = (NodeTexSky *)node->storage;
|
|
|
|
|
tex->sun_intensity = 1.0f;
|
|
|
|
|
tex->altitude *= 0.001f;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
FOREACH_NODETREE_END;
|
|
|
|
|
}
|
2020-07-21 16:32:00 -04:00
|
|
|
|
|
|
|
|
/* Refactor bevel affect type to use an enum. */
|
|
|
|
|
if (!DNA_struct_elem_find(fd->filesdna, "BevelModifierData", "char", "affect_type")) {
|
|
|
|
|
for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) {
|
|
|
|
|
LISTBASE_FOREACH (ModifierData *, md, &object->modifiers) {
|
|
|
|
|
if (md->type == eModifierType_Bevel) {
|
|
|
|
|
BevelModifierData *bmd = (BevelModifierData *)md;
|
|
|
|
|
const bool use_vertex_bevel = bmd->flags & MOD_BEVEL_VERT_DEPRECATED;
|
|
|
|
|
bmd->affect_type = use_vertex_bevel ? MOD_BEVEL_AFFECT_VERTICES :
|
|
|
|
|
MOD_BEVEL_AFFECT_EDGES;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-08-03 03:28:04 +02:00
|
|
|
|
2020-09-13 15:00:52 +10:00
|
|
|
/* Initialize additional velocity parameter for #CacheFile's. */
|
2020-08-03 03:28:04 +02:00
|
|
|
if (!DNA_struct_elem_find(
|
|
|
|
|
fd->filesdna, "MeshSeqCacheModifierData", "float", "velocity_scale")) {
|
|
|
|
|
for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) {
|
|
|
|
|
LISTBASE_FOREACH (ModifierData *, md, &object->modifiers) {
|
|
|
|
|
if (md->type == eModifierType_MeshSequenceCache) {
|
|
|
|
|
MeshSeqCacheModifierData *mcmd = (MeshSeqCacheModifierData *)md;
|
|
|
|
|
mcmd->velocity_scale = 1.0f;
|
|
|
|
|
mcmd->vertex_velocities = NULL;
|
|
|
|
|
mcmd->num_vertices = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!DNA_struct_elem_find(fd->filesdna, "CacheFile", "char", "velocity_unit")) {
|
|
|
|
|
for (CacheFile *cache_file = bmain->cachefiles.first; cache_file != NULL;
|
|
|
|
|
cache_file = cache_file->id.next) {
|
|
|
|
|
BLI_strncpy(cache_file->velocity_name, ".velocities", sizeof(cache_file->velocity_name));
|
|
|
|
|
cache_file->velocity_unit = CACHEFILE_VELOCITY_UNIT_SECOND;
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-08-03 10:08:31 -04:00
|
|
|
|
|
|
|
|
if (!DNA_struct_elem_find(fd->filesdna, "OceanModifierData", "int", "viewport_resolution")) {
|
|
|
|
|
for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) {
|
|
|
|
|
LISTBASE_FOREACH (ModifierData *, md, &object->modifiers) {
|
|
|
|
|
if (md->type == eModifierType_Ocean) {
|
|
|
|
|
OceanModifierData *omd = (OceanModifierData *)md;
|
|
|
|
|
omd->viewport_resolution = omd->resolution;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-08-19 11:37:21 -04:00
|
|
|
|
|
|
|
|
/* Remove panel X axis collapsing, a remnant of horizontal panel alignment. */
|
|
|
|
|
LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) {
|
|
|
|
|
LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
|
|
|
|
|
LISTBASE_FOREACH (ARegion *, region, &area->regionbase) {
|
|
|
|
|
LISTBASE_FOREACH (Panel *, panel, ®ion->panels) {
|
|
|
|
|
panels_remove_x_closed_flag_recursive(panel);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-15 10:41:08 +02:00
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 291, 2)) {
|
2020-09-15 12:55:44 +02:00
|
|
|
for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
|
|
|
|
|
RigidBodyWorld *rbw = scene->rigidbody_world;
|
|
|
|
|
|
|
|
|
|
if (rbw == NULL) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The substep method changed from "per second" to "per frame".
|
|
|
|
|
* To get the new value simply divide the old bullet sim fps with the scene fps.
|
|
|
|
|
*/
|
|
|
|
|
rbw->substeps_per_frame /= FPS;
|
|
|
|
|
|
|
|
|
|
if (rbw->substeps_per_frame <= 0) {
|
|
|
|
|
rbw->substeps_per_frame = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-04 15:36:02 +02:00
|
|
|
/* Set the minimum sequence interpolate for grease pencil. */
|
|
|
|
|
if (!DNA_struct_elem_find(fd->filesdna, "GP_Interpolate_Settings", "int", "step")) {
|
|
|
|
|
LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
|
|
|
|
|
ToolSettings *ts = scene->toolsettings;
|
|
|
|
|
ts->gp_interpolate.step = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-08-04 12:52:04 +02:00
|
|
|
/* Hair and PointCloud attributes. */
|
|
|
|
|
for (Hair *hair = bmain->hairs.first; hair != NULL; hair = hair->id.next) {
|
|
|
|
|
do_versions_point_attributes(&hair->pdata);
|
|
|
|
|
}
|
|
|
|
|
for (PointCloud *pointcloud = bmain->pointclouds.first; pointcloud != NULL;
|
|
|
|
|
pointcloud = pointcloud->id.next) {
|
|
|
|
|
do_versions_point_attributes(&pointcloud->pdata);
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-10 08:35:58 -06:00
|
|
|
/* Show outliner mode column by default. */
|
|
|
|
|
LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) {
|
|
|
|
|
LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
|
|
|
|
|
LISTBASE_FOREACH (SpaceLink *, space, &area->spacedata) {
|
|
|
|
|
if (space->spacetype == SPACE_OUTLINER) {
|
|
|
|
|
SpaceOutliner *space_outliner = (SpaceOutliner *)space;
|
|
|
|
|
|
|
|
|
|
space_outliner->flag |= SO_MODE_COLUMN;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-09-13 16:57:27 -04:00
|
|
|
|
|
|
|
|
/* Solver and Collections for Boolean. */
|
|
|
|
|
if (!DNA_struct_elem_find(fd->filesdna, "BooleanModifierData", "char", "solver")) {
|
|
|
|
|
for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) {
|
|
|
|
|
LISTBASE_FOREACH (ModifierData *, md, &object->modifiers) {
|
|
|
|
|
if (md->type == eModifierType_Boolean) {
|
|
|
|
|
BooleanModifierData *bmd = (BooleanModifierData *)md;
|
|
|
|
|
bmd->solver = eBooleanModifierSolver_Fast;
|
|
|
|
|
bmd->flag = eBooleanModifierFlag_Object;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-09-17 12:02:05 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 291, 4) && MAIN_VERSION_ATLEAST(bmain, 291, 1)) {
|
|
|
|
|
/* Due to a48d78ce07f4f, CustomData.totlayer and CustomData.maxlayer has been written
|
|
|
|
|
* incorrectly. Fortunately, the size of the layers array has been written to the .blend file
|
|
|
|
|
* as well, so we can reconstruct totlayer and maxlayer from that. */
|
|
|
|
|
LISTBASE_FOREACH (Mesh *, mesh, &bmain->meshes) {
|
|
|
|
|
mesh->vdata.totlayer = mesh->vdata.maxlayer = MEM_allocN_len(mesh->vdata.layers) /
|
|
|
|
|
sizeof(CustomDataLayer);
|
|
|
|
|
mesh->edata.totlayer = mesh->edata.maxlayer = MEM_allocN_len(mesh->edata.layers) /
|
|
|
|
|
sizeof(CustomDataLayer);
|
|
|
|
|
/* We can be sure that mesh->fdata is empty for files written by 2.90. */
|
|
|
|
|
mesh->ldata.totlayer = mesh->ldata.maxlayer = MEM_allocN_len(mesh->ldata.layers) /
|
|
|
|
|
sizeof(CustomDataLayer);
|
|
|
|
|
mesh->pdata.totlayer = mesh->pdata.maxlayer = MEM_allocN_len(mesh->pdata.layers) /
|
|
|
|
|
sizeof(CustomDataLayer);
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-09-13 16:57:27 -04:00
|
|
|
|
2020-09-17 12:02:05 +02:00
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 291, 5)) {
|
2020-09-15 10:41:08 +02:00
|
|
|
/* Fix fcurves to allow for new bezier handles behaviour (T75881 and D8752). */
|
|
|
|
|
for (bAction *act = bmain->actions.first; act; act = act->id.next) {
|
|
|
|
|
for (FCurve *fcu = act->curves.first; fcu; fcu = fcu->next) {
|
|
|
|
|
/* Only need to fix Bezier curves with at least 2 keyframes. */
|
|
|
|
|
if (fcu->totvert < 2 || fcu->bezt == NULL) {
|
2020-09-16 15:51:44 +02:00
|
|
|
continue;
|
2020-09-15 10:41:08 +02:00
|
|
|
}
|
|
|
|
|
do_versions_291_fcurve_handles_limit(fcu);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-15 18:47:35 -05:00
|
|
|
LISTBASE_FOREACH (Collection *, collection, &bmain->collections) {
|
|
|
|
|
collection->color_tag = COLLECTION_COLOR_NONE;
|
|
|
|
|
}
|
|
|
|
|
LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
|
2020-09-16 09:03:37 -06:00
|
|
|
/* Old files do not have a master collection, but it will be created by
|
|
|
|
|
* `BKE_collection_master_add()`. */
|
|
|
|
|
if (scene->master_collection) {
|
|
|
|
|
scene->master_collection->color_tag = COLLECTION_COLOR_NONE;
|
|
|
|
|
}
|
2020-09-15 18:47:35 -05:00
|
|
|
}
|
|
|
|
|
|
2020-09-17 12:02:05 +02:00
|
|
|
/* Add custom profile and bevel mode to curve bevels. */
|
|
|
|
|
if (!DNA_struct_elem_find(fd->filesdna, "Curve", "char", "bevel_mode")) {
|
|
|
|
|
LISTBASE_FOREACH (Curve *, curve, &bmain->curves) {
|
|
|
|
|
if (curve->bevobj != NULL) {
|
|
|
|
|
curve->bevel_mode = CU_BEV_MODE_OBJECT;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
curve->bevel_mode = CU_BEV_MODE_ROUND;
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-09-16 12:26:16 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-29 14:34:01 +02:00
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 291, 6)) {
|
2020-09-18 19:20:22 +02:00
|
|
|
/* Darken Inactive Overlay. */
|
|
|
|
|
if (!DNA_struct_elem_find(fd->filesdna, "View3DOverlay", "float", "fade_alpha")) {
|
|
|
|
|
for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
|
|
|
|
|
LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
|
|
|
|
|
LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
|
|
|
|
|
if (sl->spacetype == SPACE_VIEW3D) {
|
|
|
|
|
View3D *v3d = (View3D *)sl;
|
|
|
|
|
v3d->overlay.fade_alpha = 0.40f;
|
|
|
|
|
v3d->overlay.flag |= V3D_OVERLAY_FADE_INACTIVE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-09-18 19:58:48 +02:00
|
|
|
|
|
|
|
|
/* Unify symmetry as a mesh property. */
|
|
|
|
|
if (!DNA_struct_elem_find(fd->filesdna, "Mesh", "char", "symmetry")) {
|
|
|
|
|
LISTBASE_FOREACH (Mesh *, mesh, &bmain->meshes) {
|
2020-09-19 14:18:05 +10:00
|
|
|
/* The previous flags used to store mesh symmetry in edit-mode match the new ones that are
|
|
|
|
|
* used in #Mesh.symmetry. */
|
2020-09-18 19:58:48 +02:00
|
|
|
mesh->symmetry = mesh->editflag & (ME_SYMMETRY_X | ME_SYMMETRY_Y | ME_SYMMETRY_Z);
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-09-29 14:34:01 +02:00
|
|
|
|
|
|
|
|
/* Alembic importer: allow vertex interpolation by default. */
|
|
|
|
|
for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) {
|
|
|
|
|
LISTBASE_FOREACH (ModifierData *, md, &object->modifiers) {
|
|
|
|
|
if (md->type != eModifierType_MeshSequenceCache) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
MeshSeqCacheModifierData *data = (MeshSeqCacheModifierData *)md;
|
|
|
|
|
data->read_flag |= MOD_MESHSEQ_INTERPOLATE_VERTICES;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-10-01 17:58:43 +02:00
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 291, 7)) {
|
|
|
|
|
LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
|
|
|
|
|
scene->r.simplify_volumes = 1.0f;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-29 14:34:01 +02:00
|
|
|
/**
|
|
|
|
|
* Versioning code until next subversion bump goes here.
|
|
|
|
|
*
|
|
|
|
|
* \note Be sure to check when bumping the version:
|
2020-10-02 23:36:05 +10:00
|
|
|
* - "versioning_userdef.c", #blo_do_versions_userdef
|
2020-09-29 14:34:01 +02:00
|
|
|
* - "versioning_userdef.c", #do_versions_theme
|
|
|
|
|
*
|
|
|
|
|
* \note Keep this message at the bottom of the function.
|
|
|
|
|
*/
|
|
|
|
|
{
|
|
|
|
|
/* Keep this block, even when empty. */
|
2020-09-30 14:49:42 +02:00
|
|
|
if (!DNA_struct_elem_find(fd->filesdna, "WorkSpaceDataRelation", "int", "parentid")) {
|
|
|
|
|
LISTBASE_FOREACH (WorkSpace *, workspace, &bmain->workspaces) {
|
|
|
|
|
LISTBASE_FOREACH_MUTABLE (
|
|
|
|
|
WorkSpaceDataRelation *, relation, &workspace->hook_layout_relations) {
|
|
|
|
|
relation->parent = blo_read_get_new_globaldata_address(fd, relation->parent);
|
|
|
|
|
BLI_assert(relation->parentid == 0);
|
|
|
|
|
if (relation->parent != NULL) {
|
|
|
|
|
LISTBASE_FOREACH (wmWindowManager *, wm, &bmain->wm) {
|
|
|
|
|
wmWindow *win = BLI_findptr(
|
|
|
|
|
&wm->windows, relation->parent, offsetof(wmWindow, workspace_hook));
|
|
|
|
|
if (win != NULL) {
|
|
|
|
|
relation->parentid = win->winid;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (relation->parentid == 0) {
|
|
|
|
|
BLI_assert(
|
|
|
|
|
!"Found a valid parent for workspace data relation, but no valid parent id.");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (relation->parentid == 0) {
|
|
|
|
|
BLI_freelinkN(&workspace->hook_layout_relations, relation);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-07-03 10:28:13 -04:00
|
|
|
}
|
2020-04-16 18:10:21 +10:00
|
|
|
}
|