2021-04-20 17:08:31 +02: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
|
|
|
|
|
2021-04-22 16:33:37 +10:00
|
|
|
#include "BLI_listbase.h"
|
2021-05-11 11:22:41 +02:00
|
|
|
#include "BLI_math_vector.h"
|
2021-05-28 12:17:04 -04:00
|
|
|
#include "BLI_string.h"
|
2021-04-22 16:33:37 +10:00
|
|
|
#include "BLI_utildefines.h"
|
|
|
|
|
Armature: add B-Bone Y scale channel and extra flag fields to DNA.
In addition to the base bone transformation itself, B-Bones have
controls that affect transformation of its segments. For rotation
the features are quite complete, allowing to both reorient the
Bezier handles via properties, and to control them using custom
handle bones. However for scaling there are two deficiencies.
First, there are only X and Y scale factors (actually X and Z),
while lengthwise all segments have the same scaling. The ease
option merely affects the shape of the curve, and does not cause
actual scaling.
Second, scaling can only be controlled via properties, thus
requiring up to 6 drivers per joint between B-Bones to transfer
scaling factors from the handle bone. This is very inefficient.
Finally, the Z channels are confusingly called Y.
This commit adds a B-Bone Y Scale channel and extra B-Bone flag
fields to DNA with appropriate versioning (including for F-Curves
and drivers) in preparation to addressing these limitations.
Functionality is not changed, so the new fields are not used
until the following commits.
Differential Revision: https://developer.blender.org/D9870
2020-12-11 19:17:39 +03:00
|
|
|
#include "DNA_anim_types.h"
|
|
|
|
#include "DNA_armature_types.h"
|
2021-05-04 16:38:52 +02:00
|
|
|
#include "DNA_brush_types.h"
|
2021-04-22 16:33:37 +10:00
|
|
|
#include "DNA_genfile.h"
|
2021-06-04 11:40:27 +02:00
|
|
|
#include "DNA_listBase.h"
|
2021-04-22 16:33:37 +10:00
|
|
|
#include "DNA_modifier_types.h"
|
2021-05-04 14:46:32 +02:00
|
|
|
#include "DNA_text_types.h"
|
2021-04-22 16:33:37 +10:00
|
|
|
|
Armature: add B-Bone Y scale channel and extra flag fields to DNA.
In addition to the base bone transformation itself, B-Bones have
controls that affect transformation of its segments. For rotation
the features are quite complete, allowing to both reorient the
Bezier handles via properties, and to control them using custom
handle bones. However for scaling there are two deficiencies.
First, there are only X and Y scale factors (actually X and Z),
while lengthwise all segments have the same scaling. The ease
option merely affects the shape of the curve, and does not cause
actual scaling.
Second, scaling can only be controlled via properties, thus
requiring up to 6 drivers per joint between B-Bones to transfer
scaling factors from the handle bone. This is very inefficient.
Finally, the Z channels are confusingly called Y.
This commit adds a B-Bone Y Scale channel and extra B-Bone flag
fields to DNA with appropriate versioning (including for F-Curves
and drivers) in preparation to addressing these limitations.
Functionality is not changed, so the new fields are not used
until the following commits.
Differential Revision: https://developer.blender.org/D9870
2020-12-11 19:17:39 +03:00
|
|
|
#include "BKE_animsys.h"
|
|
|
|
#include "BKE_fcurve_driver.h"
|
2021-05-04 14:46:32 +02:00
|
|
|
#include "BKE_lib_id.h"
|
2021-04-20 17:08:31 +02:00
|
|
|
#include "BKE_main.h"
|
2021-05-14 11:22:02 +02:00
|
|
|
#include "BKE_node.h"
|
2021-04-20 17:08:31 +02:00
|
|
|
|
|
|
|
#include "BLO_readfile.h"
|
|
|
|
#include "readfile.h"
|
|
|
|
|
Armature: add B-Bone Y scale channel and extra flag fields to DNA.
In addition to the base bone transformation itself, B-Bones have
controls that affect transformation of its segments. For rotation
the features are quite complete, allowing to both reorient the
Bezier handles via properties, and to control them using custom
handle bones. However for scaling there are two deficiencies.
First, there are only X and Y scale factors (actually X and Z),
while lengthwise all segments have the same scaling. The ease
option merely affects the shape of the curve, and does not cause
actual scaling.
Second, scaling can only be controlled via properties, thus
requiring up to 6 drivers per joint between B-Bones to transfer
scaling factors from the handle bone. This is very inefficient.
Finally, the Z channels are confusingly called Y.
This commit adds a B-Bone Y Scale channel and extra B-Bone flag
fields to DNA with appropriate versioning (including for F-Curves
and drivers) in preparation to addressing these limitations.
Functionality is not changed, so the new fields are not used
until the following commits.
Differential Revision: https://developer.blender.org/D9870
2020-12-11 19:17:39 +03:00
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
|
2021-06-18 16:33:02 -05:00
|
|
|
#include "versioning_common.h"
|
|
|
|
|
2021-06-04 11:40:27 +02:00
|
|
|
static void sort_linked_ids(Main *bmain)
|
|
|
|
{
|
|
|
|
ListBase *lb;
|
|
|
|
FOREACH_MAIN_LISTBASE_BEGIN (bmain, lb) {
|
|
|
|
ListBase temp_list;
|
|
|
|
BLI_listbase_clear(&temp_list);
|
|
|
|
LISTBASE_FOREACH_MUTABLE (ID *, id, lb) {
|
|
|
|
if (ID_IS_LINKED(id)) {
|
|
|
|
BLI_remlink(lb, id);
|
|
|
|
BLI_addtail(&temp_list, id);
|
|
|
|
id_sort_by_name(&temp_list, id, NULL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
BLI_movelisttolist(lb, &temp_list);
|
|
|
|
}
|
|
|
|
FOREACH_MAIN_LISTBASE_END;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void assert_sorted_ids(Main *bmain)
|
|
|
|
{
|
|
|
|
#ifndef NDEBUG
|
|
|
|
ListBase *lb;
|
|
|
|
FOREACH_MAIN_LISTBASE_BEGIN (bmain, lb) {
|
|
|
|
ID *id_prev = NULL;
|
|
|
|
LISTBASE_FOREACH (ID *, id, lb) {
|
|
|
|
if (id_prev == NULL) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
BLI_assert(id_prev->lib != id->lib || BLI_strcasecmp(id_prev->name, id->name) < 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
FOREACH_MAIN_LISTBASE_END;
|
|
|
|
#else
|
|
|
|
UNUSED_VARS_NDEBUG(bmain);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2021-05-04 14:46:32 +02:00
|
|
|
void do_versions_after_linking_300(Main *bmain, ReportList *UNUSED(reports))
|
2021-04-20 17:08:31 +02:00
|
|
|
{
|
2021-05-04 14:46:32 +02:00
|
|
|
if (MAIN_VERSION_ATLEAST(bmain, 300, 0) && !MAIN_VERSION_ATLEAST(bmain, 300, 1)) {
|
|
|
|
/* Set zero user text objects to have a fake user. */
|
|
|
|
LISTBASE_FOREACH (Text *, text, &bmain->texts) {
|
|
|
|
if (text->id.us == 0) {
|
|
|
|
id_fake_user_set(&text->id);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2021-05-14 11:22:02 +02:00
|
|
|
|
2021-06-04 11:40:27 +02:00
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 300, 3)) {
|
2021-05-14 11:22:02 +02:00
|
|
|
/* Use new texture socket in Attribute Sample Texture node. */
|
|
|
|
LISTBASE_FOREACH (bNodeTree *, ntree, &bmain->nodetrees) {
|
|
|
|
if (ntree->type != NTREE_GEOMETRY) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
|
|
if (node->type != GEO_NODE_ATTRIBUTE_SAMPLE_TEXTURE) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (node->id == NULL) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
LISTBASE_FOREACH (bNodeSocket *, socket, &node->inputs) {
|
|
|
|
if (socket->type == SOCK_TEXTURE) {
|
|
|
|
bNodeSocketValueTexture *socket_value = (bNodeSocketValueTexture *)
|
|
|
|
socket->default_value;
|
|
|
|
socket_value->value = (Tex *)node->id;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
node->id = NULL;
|
|
|
|
}
|
|
|
|
}
|
2021-06-04 11:40:27 +02:00
|
|
|
|
|
|
|
sort_linked_ids(bmain);
|
|
|
|
assert_sorted_ids(bmain);
|
|
|
|
}
|
|
|
|
if (MAIN_VERSION_ATLEAST(bmain, 300, 3)) {
|
|
|
|
assert_sorted_ids(bmain);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Versioning code until next subversion bump goes here.
|
|
|
|
*
|
|
|
|
* \note Be sure to check when bumping the version:
|
|
|
|
* - #blo_do_versions_300 in this file.
|
|
|
|
* - "versioning_userdef.c", #blo_do_versions_userdef
|
|
|
|
* - "versioning_userdef.c", #do_versions_theme
|
|
|
|
*
|
|
|
|
* \note Keep this message at the bottom of the function.
|
|
|
|
*/
|
|
|
|
{
|
|
|
|
/* Keep this block, even when empty. */
|
2021-04-20 17:08:31 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-05-28 12:17:04 -04:00
|
|
|
static void version_switch_node_input_prefix(Main *bmain)
|
|
|
|
{
|
|
|
|
FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
|
|
|
|
if (ntree->type == NTREE_GEOMETRY) {
|
|
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
|
|
if (node->type == GEO_NODE_SWITCH) {
|
|
|
|
LISTBASE_FOREACH (bNodeSocket *, socket, &node->inputs) {
|
|
|
|
/* Skip the "switch" socket. */
|
|
|
|
if (socket == node->inputs.first) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
strcpy(socket->name, socket->name[0] == 'A' ? "False" : "True");
|
|
|
|
|
|
|
|
/* Replace "A" and "B", but keep the unique number suffix at the end. */
|
|
|
|
char number_suffix[8];
|
|
|
|
BLI_strncpy(number_suffix, socket->identifier + 1, sizeof(number_suffix));
|
|
|
|
strcpy(socket->identifier, socket->name);
|
|
|
|
strcat(socket->identifier, number_suffix);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
FOREACH_NODETREE_END;
|
|
|
|
}
|
|
|
|
|
2021-06-08 11:11:49 -05:00
|
|
|
static void version_node_socket_name(bNodeTree *ntree,
|
|
|
|
const int node_type,
|
|
|
|
const char *old_name,
|
|
|
|
const char *new_name)
|
|
|
|
{
|
|
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
|
|
if (node->type == node_type) {
|
|
|
|
LISTBASE_FOREACH (bNodeSocket *, socket, &node->inputs) {
|
|
|
|
if (STREQ(socket->name, old_name)) {
|
|
|
|
strcpy(socket->name, new_name);
|
|
|
|
}
|
|
|
|
if (STREQ(socket->identifier, old_name)) {
|
|
|
|
strcpy(socket->identifier, new_name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
LISTBASE_FOREACH (bNodeSocket *, socket, &node->outputs) {
|
|
|
|
if (STREQ(socket->name, old_name)) {
|
|
|
|
strcpy(socket->name, new_name);
|
|
|
|
}
|
|
|
|
if (STREQ(socket->identifier, old_name)) {
|
|
|
|
strcpy(socket->identifier, new_name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Armature: add B-Bone Y scale channel and extra flag fields to DNA.
In addition to the base bone transformation itself, B-Bones have
controls that affect transformation of its segments. For rotation
the features are quite complete, allowing to both reorient the
Bezier handles via properties, and to control them using custom
handle bones. However for scaling there are two deficiencies.
First, there are only X and Y scale factors (actually X and Z),
while lengthwise all segments have the same scaling. The ease
option merely affects the shape of the curve, and does not cause
actual scaling.
Second, scaling can only be controlled via properties, thus
requiring up to 6 drivers per joint between B-Bones to transfer
scaling factors from the handle bone. This is very inefficient.
Finally, the Z channels are confusingly called Y.
This commit adds a B-Bone Y Scale channel and extra B-Bone flag
fields to DNA with appropriate versioning (including for F-Curves
and drivers) in preparation to addressing these limitations.
Functionality is not changed, so the new fields are not used
until the following commits.
Differential Revision: https://developer.blender.org/D9870
2020-12-11 19:17:39 +03:00
|
|
|
static bool replace_bbone_len_scale_rnapath(char **p_old_path, int *p_index)
|
|
|
|
{
|
|
|
|
char *old_path = *p_old_path;
|
|
|
|
|
|
|
|
if (old_path == NULL) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
int len = strlen(old_path);
|
|
|
|
|
|
|
|
if (BLI_str_endswith(old_path, ".bbone_curveiny") ||
|
|
|
|
BLI_str_endswith(old_path, ".bbone_curveouty")) {
|
|
|
|
old_path[len - 1] = 'z';
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (BLI_str_endswith(old_path, ".bbone_scaleinx") ||
|
|
|
|
BLI_str_endswith(old_path, ".bbone_scaleiny") ||
|
|
|
|
BLI_str_endswith(old_path, ".bbone_scaleoutx") ||
|
|
|
|
BLI_str_endswith(old_path, ".bbone_scaleouty")) {
|
|
|
|
int index = (old_path[len - 1] == 'y' ? 2 : 0);
|
|
|
|
|
|
|
|
old_path[len - 1] = 0;
|
|
|
|
|
|
|
|
if (p_index) {
|
|
|
|
*p_index = index;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
*p_old_path = BLI_sprintfN("%s[%d]", old_path, index);
|
|
|
|
MEM_freeN(old_path);
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void do_version_bbone_len_scale_fcurve_fix(FCurve *fcu)
|
|
|
|
{
|
|
|
|
/* Update driver variable paths. */
|
|
|
|
if (fcu->driver) {
|
|
|
|
LISTBASE_FOREACH (DriverVar *, dvar, &fcu->driver->variables) {
|
|
|
|
DRIVER_TARGETS_LOOPER_BEGIN (dvar) {
|
|
|
|
replace_bbone_len_scale_rnapath(&dtar->rna_path, NULL);
|
|
|
|
}
|
|
|
|
DRIVER_TARGETS_LOOPER_END;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Update F-Curve's path. */
|
|
|
|
replace_bbone_len_scale_rnapath(&fcu->rna_path, &fcu->array_index);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void do_version_bbone_len_scale_animdata_cb(ID *UNUSED(id),
|
|
|
|
AnimData *adt,
|
|
|
|
void *UNUSED(wrapper_data))
|
|
|
|
{
|
|
|
|
LISTBASE_FOREACH_MUTABLE (FCurve *, fcu, &adt->drivers) {
|
|
|
|
do_version_bbone_len_scale_fcurve_fix(fcu);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void do_version_bones_bbone_len_scale(ListBase *lb)
|
|
|
|
{
|
|
|
|
LISTBASE_FOREACH (Bone *, bone, lb) {
|
|
|
|
if (bone->flag & BONE_ADD_PARENT_END_ROLL) {
|
|
|
|
bone->bbone_flag |= BBONE_ADD_PARENT_END_ROLL;
|
|
|
|
}
|
|
|
|
|
|
|
|
copy_v3_fl3(bone->scale_in, bone->scale_in_x, 1.0f, bone->scale_in_z);
|
|
|
|
copy_v3_fl3(bone->scale_out, bone->scale_out_x, 1.0f, bone->scale_out_z);
|
|
|
|
|
|
|
|
do_version_bones_bbone_len_scale(&bone->childbase);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-04-20 17:08:31 +02:00
|
|
|
/* NOLINTNEXTLINE: readability-function-size */
|
2021-04-22 16:33:37 +10:00
|
|
|
void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
|
2021-04-20 17:08:31 +02:00
|
|
|
{
|
2021-05-04 14:46:32 +02:00
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 300, 1)) {
|
2021-04-22 16:33:37 +10:00
|
|
|
/* Set default value for the new bisect_threshold parameter in the mirror modifier. */
|
|
|
|
if (!DNA_struct_elem_find(fd->filesdna, "MirrorModifierData", "float", "bisect_threshold")) {
|
|
|
|
LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
|
|
|
|
LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) {
|
|
|
|
if (md->type == eModifierType_Mirror) {
|
|
|
|
MirrorModifierData *mmd = (MirrorModifierData *)md;
|
|
|
|
/* This was the previous hard-coded value. */
|
|
|
|
mmd->bisect_threshold = 0.001f;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2021-05-04 16:38:52 +02:00
|
|
|
/* Grease Pencil: Set default value for dilate pixels. */
|
|
|
|
if (!DNA_struct_elem_find(fd->filesdna, "BrushGpencilSettings", "int", "dilate_pixels")) {
|
|
|
|
LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) {
|
|
|
|
if (brush->gpencil_settings) {
|
|
|
|
brush->gpencil_settings->dilate_pixels = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2021-04-20 17:08:31 +02:00
|
|
|
}
|
2021-05-28 12:17:04 -04:00
|
|
|
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 300, 2)) {
|
|
|
|
version_switch_node_input_prefix(bmain);
|
|
|
|
|
|
|
|
if (!DNA_struct_elem_find(fd->filesdna, "bPoseChannel", "float", "custom_scale_xyz[3]")) {
|
|
|
|
LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
|
|
|
|
if (ob->pose == NULL) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
LISTBASE_FOREACH (bPoseChannel *, pchan, &ob->pose->chanbase) {
|
|
|
|
copy_v3_fl(pchan->custom_scale_xyz, pchan->custom_scale);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-06-18 16:33:02 -05:00
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 300, 4)) {
|
|
|
|
/* Add a properties sidebar to the spreadsheet editor. */
|
|
|
|
LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) {
|
|
|
|
LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
|
|
|
|
LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
|
|
|
|
if (sl->spacetype == SPACE_SPREADSHEET) {
|
|
|
|
ListBase *regionbase = (sl == area->spacedata.first) ? &area->regionbase :
|
|
|
|
&sl->regionbase;
|
|
|
|
ARegion *new_sidebar = do_versions_add_region_if_not_found(
|
|
|
|
regionbase, RGN_TYPE_UI, "sidebar for spreadsheet", RGN_TYPE_FOOTER);
|
|
|
|
if (new_sidebar != NULL) {
|
|
|
|
new_sidebar->alignment = RGN_ALIGN_RIGHT;
|
|
|
|
new_sidebar->flag |= RGN_FLAG_HIDDEN;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Enable spreadsheet filtering in old files without row filters. */
|
|
|
|
LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) {
|
|
|
|
LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
|
|
|
|
LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
|
|
|
|
if (sl->spacetype == SPACE_SPREADSHEET) {
|
|
|
|
SpaceSpreadsheet *sspreadsheet = (SpaceSpreadsheet *)sl;
|
|
|
|
sspreadsheet->filter_flag |= SPREADSHEET_FILTER_ENABLE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-06-08 11:11:49 -05:00
|
|
|
FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
|
|
|
|
if (ntree->type == NTREE_GEOMETRY) {
|
|
|
|
version_node_socket_name(ntree, GEO_NODE_BOUNDING_BOX, "Mesh", "Bounding Box");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
FOREACH_NODETREE_END;
|
2021-06-11 16:35:39 +02:00
|
|
|
|
|
|
|
if (!DNA_struct_elem_find(fd->filesdna, "FileAssetSelectParams", "int", "import_type")) {
|
|
|
|
LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) {
|
|
|
|
LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
|
|
|
|
LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
|
|
|
|
if (sl->spacetype == SPACE_FILE) {
|
|
|
|
SpaceFile *sfile = (SpaceFile *)sl;
|
|
|
|
if (sfile->asset_params) {
|
|
|
|
sfile->asset_params->import_type = FILE_ASSET_IMPORT_APPEND;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
Armature: add B-Bone Y scale channel and extra flag fields to DNA.
In addition to the base bone transformation itself, B-Bones have
controls that affect transformation of its segments. For rotation
the features are quite complete, allowing to both reorient the
Bezier handles via properties, and to control them using custom
handle bones. However for scaling there are two deficiencies.
First, there are only X and Y scale factors (actually X and Z),
while lengthwise all segments have the same scaling. The ease
option merely affects the shape of the curve, and does not cause
actual scaling.
Second, scaling can only be controlled via properties, thus
requiring up to 6 drivers per joint between B-Bones to transfer
scaling factors from the handle bone. This is very inefficient.
Finally, the Z channels are confusingly called Y.
This commit adds a B-Bone Y Scale channel and extra B-Bone flag
fields to DNA with appropriate versioning (including for F-Curves
and drivers) in preparation to addressing these limitations.
Functionality is not changed, so the new fields are not used
until the following commits.
Differential Revision: https://developer.blender.org/D9870
2020-12-11 19:17:39 +03:00
|
|
|
|
|
|
|
/* Initialize length-wise scale B-Bone settings. */
|
|
|
|
if (!DNA_struct_elem_find(fd->filesdna, "Bone", "int", "bbone_flag")) {
|
|
|
|
/* Update armature data and pose channels. */
|
|
|
|
LISTBASE_FOREACH (bArmature *, arm, &bmain->armatures) {
|
|
|
|
do_version_bones_bbone_len_scale(&arm->bonebase);
|
|
|
|
}
|
|
|
|
|
|
|
|
LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
|
|
|
|
if (ob->pose) {
|
|
|
|
LISTBASE_FOREACH (bPoseChannel *, pchan, &ob->pose->chanbase) {
|
|
|
|
copy_v3_fl3(pchan->scale_in, pchan->scale_in_x, 1.0f, pchan->scale_in_z);
|
|
|
|
copy_v3_fl3(pchan->scale_out, pchan->scale_out_x, 1.0f, pchan->scale_out_z);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Update action curves and drivers. */
|
|
|
|
LISTBASE_FOREACH (bAction *, act, &bmain->actions) {
|
|
|
|
LISTBASE_FOREACH_MUTABLE (FCurve *, fcu, &act->curves) {
|
|
|
|
do_version_bbone_len_scale_fcurve_fix(fcu);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
BKE_animdata_main_cb(bmain, do_version_bbone_len_scale_animdata_cb, NULL);
|
|
|
|
}
|
2021-05-04 14:46:32 +02:00
|
|
|
}
|
2021-06-18 16:33:02 -05:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Versioning code until next subversion bump goes here.
|
|
|
|
*
|
|
|
|
* \note Be sure to check when bumping the version:
|
|
|
|
* - "versioning_userdef.c", #blo_do_versions_userdef
|
|
|
|
* - "versioning_userdef.c", #do_versions_theme
|
|
|
|
*
|
|
|
|
* \note Keep this message at the bottom of the function.
|
|
|
|
*/
|
|
|
|
{
|
|
|
|
/* Keep this block, even when empty. */
|
|
|
|
}
|
2021-04-20 17:08:31 +02:00
|
|
|
}
|