1604 lines
56 KiB
C
1604 lines
56 KiB
C
/*
|
|
* 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 <float.h>
|
|
#include <string.h>
|
|
|
|
#include "BLI_listbase.h"
|
|
#include "BLI_math.h"
|
|
#include "BLI_string.h"
|
|
#include "BLI_utildefines.h"
|
|
|
|
#include "DNA_anim_types.h"
|
|
#include "DNA_camera_types.h"
|
|
#include "DNA_color_types.h"
|
|
#include "DNA_light_types.h"
|
|
#include "DNA_node_types.h"
|
|
#include "DNA_particle_types.h"
|
|
|
|
#include "BKE_animsys.h"
|
|
#include "BKE_colortools.h"
|
|
#include "BKE_idprop.h"
|
|
#include "BKE_main.h"
|
|
#include "BKE_node.h"
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
#include "IMB_colormanagement.h"
|
|
|
|
#include "BLO_readfile.h"
|
|
#include "readfile.h"
|
|
|
|
static bool socket_is_used(bNodeSocket *sock)
|
|
{
|
|
return sock->flag & SOCK_IN_USE;
|
|
}
|
|
|
|
static float *cycles_node_socket_float_value(bNodeSocket *socket)
|
|
{
|
|
bNodeSocketValueFloat *socket_data = socket->default_value;
|
|
return &socket_data->value;
|
|
}
|
|
|
|
static float *cycles_node_socket_rgba_value(bNodeSocket *socket)
|
|
{
|
|
bNodeSocketValueRGBA *socket_data = socket->default_value;
|
|
return socket_data->value;
|
|
}
|
|
|
|
static float *cycles_node_socket_vector_value(bNodeSocket *socket)
|
|
{
|
|
bNodeSocketValueVector *socket_data = socket->default_value;
|
|
return socket_data->value;
|
|
}
|
|
|
|
static IDProperty *cycles_properties_from_ID(ID *id)
|
|
{
|
|
IDProperty *idprop = IDP_GetProperties(id, false);
|
|
return (idprop) ? IDP_GetPropertyTypeFromGroup(idprop, "cycles", IDP_GROUP) : NULL;
|
|
}
|
|
|
|
static IDProperty *cycles_properties_from_view_layer(ViewLayer *view_layer)
|
|
{
|
|
IDProperty *idprop = view_layer->id_properties;
|
|
return (idprop) ? IDP_GetPropertyTypeFromGroup(idprop, "cycles", IDP_GROUP) : NULL;
|
|
}
|
|
|
|
static float cycles_property_float(IDProperty *idprop, const char *name, float default_value)
|
|
{
|
|
IDProperty *prop = IDP_GetPropertyTypeFromGroup(idprop, name, IDP_FLOAT);
|
|
return (prop) ? IDP_Float(prop) : default_value;
|
|
}
|
|
|
|
static int cycles_property_int(IDProperty *idprop, const char *name, int default_value)
|
|
{
|
|
IDProperty *prop = IDP_GetPropertyTypeFromGroup(idprop, name, IDP_INT);
|
|
return (prop) ? IDP_Int(prop) : default_value;
|
|
}
|
|
|
|
static void cycles_property_int_set(IDProperty *idprop, const char *name, int value)
|
|
{
|
|
IDProperty *prop = IDP_GetPropertyTypeFromGroup(idprop, name, IDP_INT);
|
|
if (prop) {
|
|
IDP_Int(prop) = value;
|
|
}
|
|
else {
|
|
IDPropertyTemplate val = {0};
|
|
val.i = value;
|
|
IDP_AddToGroup(idprop, IDP_New(IDP_INT, &val, name));
|
|
}
|
|
}
|
|
|
|
static bool cycles_property_boolean(IDProperty *idprop, const char *name, bool default_value)
|
|
{
|
|
return cycles_property_int(idprop, name, default_value);
|
|
}
|
|
|
|
static void cycles_property_boolean_set(IDProperty *idprop, const char *name, bool value)
|
|
{
|
|
cycles_property_int_set(idprop, name, value);
|
|
}
|
|
|
|
static void displacement_node_insert(bNodeTree *ntree)
|
|
{
|
|
bool need_update = false;
|
|
|
|
/* Iterate backwards from end so we don't encounter newly added links. */
|
|
bNodeLink *prevlink;
|
|
for (bNodeLink *link = ntree->links.last; link; link = prevlink) {
|
|
prevlink = link->prev;
|
|
|
|
/* Detect link to replace. */
|
|
bNode *fromnode = link->fromnode;
|
|
bNodeSocket *fromsock = link->fromsock;
|
|
bNode *tonode = link->tonode;
|
|
bNodeSocket *tosock = link->tosock;
|
|
|
|
if (!(tonode->type == SH_NODE_OUTPUT_MATERIAL && fromnode->type != SH_NODE_DISPLACEMENT &&
|
|
STREQ(tosock->identifier, "Displacement"))) {
|
|
continue;
|
|
}
|
|
|
|
/* Replace link with displacement node. */
|
|
nodeRemLink(ntree, link);
|
|
|
|
/* Add displacement node. */
|
|
bNode *node = nodeAddStaticNode(NULL, ntree, SH_NODE_DISPLACEMENT);
|
|
node->locx = 0.5f * (fromnode->locx + tonode->locx);
|
|
node->locy = 0.5f * (fromnode->locy + tonode->locy);
|
|
|
|
bNodeSocket *scale_socket = nodeFindSocket(node, SOCK_IN, "Scale");
|
|
bNodeSocket *midlevel_socket = nodeFindSocket(node, SOCK_IN, "Midlevel");
|
|
bNodeSocket *height_socket = nodeFindSocket(node, SOCK_IN, "Height");
|
|
bNodeSocket *displacement_socket = nodeFindSocket(node, SOCK_OUT, "Displacement");
|
|
|
|
/* Set default values for compatibility. */
|
|
*cycles_node_socket_float_value(scale_socket) = 0.1f;
|
|
*cycles_node_socket_float_value(midlevel_socket) = 0.0f;
|
|
|
|
/* Link to input and material output node. */
|
|
nodeAddLink(ntree, fromnode, fromsock, node, height_socket);
|
|
nodeAddLink(ntree, node, displacement_socket, tonode, tosock);
|
|
|
|
need_update = true;
|
|
}
|
|
|
|
if (need_update) {
|
|
ntreeUpdateTree(NULL, ntree);
|
|
}
|
|
}
|
|
|
|
static void displacement_principled_nodes(bNode *node)
|
|
{
|
|
if (node->type == SH_NODE_DISPLACEMENT) {
|
|
if (node->custom1 != SHD_SPACE_WORLD) {
|
|
node->custom1 = SHD_SPACE_OBJECT;
|
|
}
|
|
}
|
|
else if (node->type == SH_NODE_BSDF_PRINCIPLED) {
|
|
if (node->custom2 != SHD_SUBSURFACE_RANDOM_WALK) {
|
|
node->custom2 = SHD_SUBSURFACE_BURLEY;
|
|
}
|
|
}
|
|
}
|
|
|
|
static bool node_has_roughness(bNode *node)
|
|
{
|
|
return ELEM(node->type,
|
|
SH_NODE_BSDF_ANISOTROPIC,
|
|
SH_NODE_BSDF_GLASS,
|
|
SH_NODE_BSDF_GLOSSY,
|
|
SH_NODE_BSDF_REFRACTION);
|
|
}
|
|
|
|
static void square_roughness_node_insert(bNodeTree *ntree)
|
|
{
|
|
bool need_update = false;
|
|
|
|
/* Update default values */
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
if (node_has_roughness(node)) {
|
|
bNodeSocket *roughness_input = nodeFindSocket(node, SOCK_IN, "Roughness");
|
|
float *roughness_value = cycles_node_socket_float_value(roughness_input);
|
|
*roughness_value = sqrtf(max_ff(*roughness_value, 0.0f));
|
|
}
|
|
}
|
|
|
|
/* Iterate backwards from end so we don't encounter newly added links. */
|
|
bNodeLink *prevlink;
|
|
for (bNodeLink *link = ntree->links.last; link; link = prevlink) {
|
|
prevlink = link->prev;
|
|
|
|
/* Detect link to replace. */
|
|
bNode *fromnode = link->fromnode;
|
|
bNodeSocket *fromsock = link->fromsock;
|
|
bNode *tonode = link->tonode;
|
|
bNodeSocket *tosock = link->tosock;
|
|
|
|
if (!(node_has_roughness(tonode) && STREQ(tosock->identifier, "Roughness"))) {
|
|
continue;
|
|
}
|
|
|
|
/* Replace links with sqrt node */
|
|
nodeRemLink(ntree, link);
|
|
|
|
/* Add sqrt node. */
|
|
bNode *node = nodeAddStaticNode(NULL, ntree, SH_NODE_MATH);
|
|
node->custom1 = NODE_MATH_POWER;
|
|
node->locx = 0.5f * (fromnode->locx + tonode->locx);
|
|
node->locy = 0.5f * (fromnode->locy + tonode->locy);
|
|
|
|
/* Link to input and material output node. */
|
|
*cycles_node_socket_float_value(node->inputs.last) = 0.5f;
|
|
nodeAddLink(ntree, fromnode, fromsock, node, node->inputs.first);
|
|
nodeAddLink(ntree, node, node->outputs.first, tonode, tosock);
|
|
|
|
need_update = true;
|
|
}
|
|
|
|
if (need_update) {
|
|
ntreeUpdateTree(NULL, ntree);
|
|
}
|
|
}
|
|
|
|
static void mapping_node_order_flip(bNode *node)
|
|
{
|
|
/* Flip euler order of mapping shader node */
|
|
if (node->type == SH_NODE_MAPPING && node->storage) {
|
|
TexMapping *texmap = node->storage;
|
|
|
|
float quat[4];
|
|
eulO_to_quat(quat, texmap->rot, EULER_ORDER_ZYX);
|
|
quat_to_eulO(texmap->rot, EULER_ORDER_XYZ, quat);
|
|
}
|
|
}
|
|
|
|
static void vector_curve_node_remap(bNode *node)
|
|
{
|
|
/* Remap values of vector curve node from normalized to absolute values */
|
|
if (node->type == SH_NODE_CURVE_VEC && node->storage) {
|
|
CurveMapping *mapping = node->storage;
|
|
mapping->flag &= ~CUMA_DO_CLIP;
|
|
|
|
for (int curve_index = 0; curve_index < CM_TOT; curve_index++) {
|
|
CurveMap *cm = &mapping->cm[curve_index];
|
|
if (cm->curve) {
|
|
for (int i = 0; i < cm->totpoint; i++) {
|
|
cm->curve[i].x = (cm->curve[i].x * 2.0f) - 1.0f;
|
|
cm->curve[i].y = (cm->curve[i].y - 0.5f) * 2.0f;
|
|
}
|
|
}
|
|
}
|
|
|
|
BKE_curvemapping_changed_all(mapping);
|
|
}
|
|
}
|
|
|
|
static void ambient_occlusion_node_relink(bNodeTree *ntree)
|
|
{
|
|
bool need_update = false;
|
|
|
|
/* Set default values. */
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
if (node->type == SH_NODE_AMBIENT_OCCLUSION) {
|
|
node->custom1 = 1; /* samples */
|
|
node->custom2 &= ~SHD_AO_LOCAL;
|
|
|
|
bNodeSocket *distance_socket = nodeFindSocket(node, SOCK_IN, "Distance");
|
|
*cycles_node_socket_float_value(distance_socket) = 0.0f;
|
|
}
|
|
}
|
|
|
|
/* Iterate backwards from end so we don't encounter newly added links. */
|
|
bNodeLink *prevlink;
|
|
for (bNodeLink *link = ntree->links.last; link; link = prevlink) {
|
|
prevlink = link->prev;
|
|
|
|
/* Detect link to replace. */
|
|
bNode *fromnode = link->fromnode;
|
|
bNode *tonode = link->tonode;
|
|
bNodeSocket *tosock = link->tosock;
|
|
|
|
if (!(fromnode->type == SH_NODE_AMBIENT_OCCLUSION)) {
|
|
continue;
|
|
}
|
|
|
|
/* Replace links with color socket. */
|
|
nodeRemLink(ntree, link);
|
|
bNodeSocket *color_socket = nodeFindSocket(fromnode, SOCK_OUT, "Color");
|
|
nodeAddLink(ntree, fromnode, color_socket, tonode, tosock);
|
|
|
|
need_update = true;
|
|
}
|
|
|
|
if (need_update) {
|
|
ntreeUpdateTree(NULL, ntree);
|
|
}
|
|
}
|
|
|
|
static void image_node_colorspace(bNode *node)
|
|
{
|
|
if (node->id == NULL) {
|
|
return;
|
|
}
|
|
|
|
int color_space;
|
|
if (node->type == SH_NODE_TEX_IMAGE && node->storage) {
|
|
NodeTexImage *tex = node->storage;
|
|
color_space = tex->color_space;
|
|
}
|
|
else if (node->type == SH_NODE_TEX_ENVIRONMENT && node->storage) {
|
|
NodeTexEnvironment *tex = node->storage;
|
|
color_space = tex->color_space;
|
|
}
|
|
else {
|
|
return;
|
|
}
|
|
|
|
const int SHD_COLORSPACE_NONE = 0;
|
|
Image *image = (Image *)node->id;
|
|
if (color_space == SHD_COLORSPACE_NONE) {
|
|
STRNCPY(image->colorspace_settings.name,
|
|
IMB_colormanagement_role_colorspace_name_get(COLOR_ROLE_DATA));
|
|
}
|
|
}
|
|
|
|
static void light_emission_node_to_energy(Light *light, float *energy, float color[3])
|
|
{
|
|
*energy = 1.0;
|
|
copy_v3_fl(color, 1.0f);
|
|
|
|
/* If nodetree has animation or drivers, don't try to convert. */
|
|
bNodeTree *ntree = light->nodetree;
|
|
if (ntree == NULL || ntree->adt) {
|
|
return;
|
|
}
|
|
|
|
/* Find emission node */
|
|
bNode *output_node = ntreeShaderOutputNode(ntree, SHD_OUTPUT_CYCLES);
|
|
if (output_node == NULL) {
|
|
return;
|
|
}
|
|
|
|
bNode *emission_node = NULL;
|
|
LISTBASE_FOREACH (bNodeLink *, link, &ntree->links) {
|
|
if (link->tonode == output_node && link->fromnode->type == SH_NODE_EMISSION) {
|
|
emission_node = link->fromnode;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (emission_node == NULL) {
|
|
return;
|
|
}
|
|
|
|
/* Don't convert if anything is linked */
|
|
bNodeSocket *strength_socket = nodeFindSocket(emission_node, SOCK_IN, "Strength");
|
|
bNodeSocket *color_socket = nodeFindSocket(emission_node, SOCK_IN, "Color");
|
|
|
|
if ((strength_socket->flag & SOCK_IN_USE) || (color_socket->flag & SOCK_IN_USE)) {
|
|
return;
|
|
}
|
|
|
|
float *strength_value = cycles_node_socket_float_value(strength_socket);
|
|
float *color_value = cycles_node_socket_rgba_value(color_socket);
|
|
|
|
*energy = *strength_value;
|
|
copy_v3_v3(color, color_value);
|
|
|
|
*strength_value = 1.0f;
|
|
copy_v4_fl(color_value, 1.0f);
|
|
light->use_nodes = false;
|
|
}
|
|
|
|
static void light_emission_unify(Light *light, const char *engine)
|
|
{
|
|
if (light->type != LA_SUN) {
|
|
light->energy *= 100.0f;
|
|
}
|
|
|
|
/* Attempt to extract constant energy and color from nodes. */
|
|
bool use_nodes = light->use_nodes;
|
|
float energy, color[3];
|
|
light_emission_node_to_energy(light, &energy, color);
|
|
|
|
if (STREQ(engine, "CYCLES")) {
|
|
if (use_nodes) {
|
|
/* Energy extracted from nodes */
|
|
light->energy = energy;
|
|
copy_v3_v3(&light->r, color);
|
|
}
|
|
else {
|
|
/* Default cycles multipliers if there are no nodes */
|
|
if (light->type == LA_SUN) {
|
|
light->energy = 1.0f;
|
|
}
|
|
else {
|
|
light->energy = 100.0f;
|
|
}
|
|
}
|
|
}
|
|
else {
|
|
/* Disable nodes if scene was configured for Eevee */
|
|
light->use_nodes = false;
|
|
}
|
|
}
|
|
|
|
/* The B input of the Math node is no longer used for single-operand operators.
|
|
* Previously, if the B input was linked and the A input was not, the B input
|
|
* was used as the input of the operator. To correct this, we move the link
|
|
* from B to A if B is linked and A is not.
|
|
*/
|
|
static void update_math_node_single_operand_operators(bNodeTree *ntree)
|
|
{
|
|
bool need_update = false;
|
|
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
if (node->type == SH_NODE_MATH) {
|
|
if (ELEM(node->custom1,
|
|
NODE_MATH_SQRT,
|
|
NODE_MATH_CEIL,
|
|
NODE_MATH_SINE,
|
|
NODE_MATH_ROUND,
|
|
NODE_MATH_FLOOR,
|
|
NODE_MATH_COSINE,
|
|
NODE_MATH_ARCSINE,
|
|
NODE_MATH_TANGENT,
|
|
NODE_MATH_ABSOLUTE,
|
|
NODE_MATH_FRACTION,
|
|
NODE_MATH_ARCCOSINE,
|
|
NODE_MATH_ARCTANGENT)) {
|
|
bNodeSocket *sockA = BLI_findlink(&node->inputs, 0);
|
|
bNodeSocket *sockB = BLI_findlink(&node->inputs, 1);
|
|
if (!sockA->link && sockB->link) {
|
|
nodeAddLink(ntree, sockB->link->fromnode, sockB->link->fromsock, node, sockA);
|
|
nodeRemLink(ntree, sockB->link);
|
|
need_update = true;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if (need_update) {
|
|
ntreeUpdateTree(NULL, ntree);
|
|
}
|
|
}
|
|
|
|
/* The Value output of the Vector Math node is no longer available in the Add
|
|
* and Subtract operators. Previously, this Value output was computed from the
|
|
* Vector output V as follows:
|
|
*
|
|
* Value = (abs(V.x) + abs(V.y) + abs(V.z)) / 3
|
|
*
|
|
* Or more compactly using vector operators:
|
|
*
|
|
* Value = dot(abs(V), (1 / 3, 1 / 3, 1 / 3))
|
|
*
|
|
* To correct this, if the Value output was used, we are going to compute
|
|
* it using the second equation by adding an absolute and a dot node, and
|
|
* then connect them appropriately.
|
|
*/
|
|
static void update_vector_math_node_add_and_subtract_operators(bNodeTree *ntree)
|
|
{
|
|
bool need_update = false;
|
|
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
if (node->type == SH_NODE_VECTOR_MATH) {
|
|
bNodeSocket *sockOutValue = nodeFindSocket(node, SOCK_OUT, "Value");
|
|
if (socket_is_used(sockOutValue) &&
|
|
ELEM(node->custom1, NODE_VECTOR_MATH_ADD, NODE_VECTOR_MATH_SUBTRACT)) {
|
|
|
|
bNode *absNode = nodeAddStaticNode(NULL, ntree, SH_NODE_VECTOR_MATH);
|
|
absNode->custom1 = NODE_VECTOR_MATH_ABSOLUTE;
|
|
absNode->locx = node->locx + node->width + 20.0f;
|
|
absNode->locy = node->locy;
|
|
|
|
bNode *dotNode = nodeAddStaticNode(NULL, ntree, SH_NODE_VECTOR_MATH);
|
|
dotNode->custom1 = NODE_VECTOR_MATH_DOT_PRODUCT;
|
|
dotNode->locx = absNode->locx + absNode->width + 20.0f;
|
|
dotNode->locy = absNode->locy;
|
|
bNodeSocket *sockDotB = BLI_findlink(&dotNode->inputs, 1);
|
|
bNodeSocket *sockDotOutValue = nodeFindSocket(dotNode, SOCK_OUT, "Value");
|
|
copy_v3_fl(cycles_node_socket_vector_value(sockDotB), 1 / 3.0f);
|
|
|
|
LISTBASE_FOREACH_BACKWARD_MUTABLE (bNodeLink *, link, &ntree->links) {
|
|
if (link->fromsock == sockOutValue) {
|
|
nodeAddLink(ntree, dotNode, sockDotOutValue, link->tonode, link->tosock);
|
|
nodeRemLink(ntree, link);
|
|
}
|
|
}
|
|
|
|
bNodeSocket *sockAbsA = BLI_findlink(&absNode->inputs, 0);
|
|
bNodeSocket *sockDotA = BLI_findlink(&dotNode->inputs, 0);
|
|
bNodeSocket *sockOutVector = nodeFindSocket(node, SOCK_OUT, "Vector");
|
|
bNodeSocket *sockAbsOutVector = nodeFindSocket(absNode, SOCK_OUT, "Vector");
|
|
|
|
nodeAddLink(ntree, node, sockOutVector, absNode, sockAbsA);
|
|
nodeAddLink(ntree, absNode, sockAbsOutVector, dotNode, sockDotA);
|
|
|
|
need_update = true;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (need_update) {
|
|
ntreeUpdateTree(NULL, ntree);
|
|
}
|
|
}
|
|
|
|
/* The Vector output of the Vector Math node is no longer available in the Dot
|
|
* Product operator. Previously, this Vector was always zero initialized. To
|
|
* correct this, we zero out any socket the Vector Output was connected to.
|
|
*/
|
|
static void update_vector_math_node_dot_product_operator(bNodeTree *ntree)
|
|
{
|
|
bool need_update = false;
|
|
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
if (node->type == SH_NODE_VECTOR_MATH) {
|
|
bNodeSocket *sockOutVector = nodeFindSocket(node, SOCK_OUT, "Vector");
|
|
if (socket_is_used(sockOutVector) && node->custom1 == NODE_VECTOR_MATH_DOT_PRODUCT) {
|
|
LISTBASE_FOREACH_MUTABLE (bNodeLink *, link, &ntree->links) {
|
|
if (link->fromsock == sockOutVector) {
|
|
switch (link->tosock->type) {
|
|
case SOCK_FLOAT:
|
|
*cycles_node_socket_float_value(link->tosock) = 0.0f;
|
|
break;
|
|
case SOCK_VECTOR:
|
|
copy_v3_fl(cycles_node_socket_vector_value(link->tosock), 0.0f);
|
|
break;
|
|
case SOCK_RGBA:
|
|
copy_v4_fl(cycles_node_socket_rgba_value(link->tosock), 0.0f);
|
|
break;
|
|
}
|
|
nodeRemLink(ntree, link);
|
|
}
|
|
}
|
|
need_update = true;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (need_update) {
|
|
ntreeUpdateTree(NULL, ntree);
|
|
}
|
|
}
|
|
|
|
/* Previously, the Vector output of the cross product operator was normalized.
|
|
* To correct this, a Normalize node is added to normalize the output if used.
|
|
* Moreover, the Value output was removed. This Value was equal to the length
|
|
* of the cross product. To correct this, a Length node is added if needed.
|
|
*/
|
|
static void update_vector_math_node_cross_product_operator(bNodeTree *ntree)
|
|
{
|
|
bool need_update = false;
|
|
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
if (node->type == SH_NODE_VECTOR_MATH) {
|
|
if (node->custom1 == NODE_VECTOR_MATH_CROSS_PRODUCT) {
|
|
bNodeSocket *sockOutVector = nodeFindSocket(node, SOCK_OUT, "Vector");
|
|
if (socket_is_used(sockOutVector)) {
|
|
bNode *normalizeNode = nodeAddStaticNode(NULL, ntree, SH_NODE_VECTOR_MATH);
|
|
normalizeNode->custom1 = NODE_VECTOR_MATH_NORMALIZE;
|
|
normalizeNode->locx = node->locx + node->width + 20.0f;
|
|
normalizeNode->locy = node->locy;
|
|
bNodeSocket *sockNormalizeOut = nodeFindSocket(normalizeNode, SOCK_OUT, "Vector");
|
|
|
|
LISTBASE_FOREACH_BACKWARD_MUTABLE (bNodeLink *, link, &ntree->links) {
|
|
if (link->fromsock == sockOutVector) {
|
|
nodeAddLink(ntree, normalizeNode, sockNormalizeOut, link->tonode, link->tosock);
|
|
nodeRemLink(ntree, link);
|
|
}
|
|
}
|
|
bNodeSocket *sockNormalizeA = BLI_findlink(&normalizeNode->inputs, 0);
|
|
nodeAddLink(ntree, node, sockOutVector, normalizeNode, sockNormalizeA);
|
|
|
|
need_update = true;
|
|
}
|
|
|
|
bNodeSocket *sockOutValue = nodeFindSocket(node, SOCK_OUT, "Value");
|
|
if (socket_is_used(sockOutValue)) {
|
|
bNode *lengthNode = nodeAddStaticNode(NULL, ntree, SH_NODE_VECTOR_MATH);
|
|
lengthNode->custom1 = NODE_VECTOR_MATH_LENGTH;
|
|
lengthNode->locx = node->locx + node->width + 20.0f;
|
|
if (socket_is_used(sockOutVector)) {
|
|
lengthNode->locy = node->locy - lengthNode->height - 20.0f;
|
|
}
|
|
else {
|
|
lengthNode->locy = node->locy;
|
|
}
|
|
bNodeSocket *sockLengthOut = nodeFindSocket(lengthNode, SOCK_OUT, "Value");
|
|
|
|
LISTBASE_FOREACH_BACKWARD_MUTABLE (bNodeLink *, link, &ntree->links) {
|
|
if (link->fromsock == sockOutValue) {
|
|
nodeAddLink(ntree, lengthNode, sockLengthOut, link->tonode, link->tosock);
|
|
nodeRemLink(ntree, link);
|
|
}
|
|
}
|
|
bNodeSocket *sockLengthA = BLI_findlink(&lengthNode->inputs, 0);
|
|
nodeAddLink(ntree, node, sockOutVector, lengthNode, sockLengthA);
|
|
|
|
need_update = true;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if (need_update) {
|
|
ntreeUpdateTree(NULL, ntree);
|
|
}
|
|
}
|
|
|
|
/* The Value output of the Vector Math node is no longer available in the
|
|
* Normalize operator. This Value output was equal to the length of the
|
|
* the input vector A. To correct this, we either add a Length node or
|
|
* convert the Normalize node into a Length node, depending on if the
|
|
* Vector output is needed.
|
|
*/
|
|
static void update_vector_math_node_normalize_operator(bNodeTree *ntree)
|
|
{
|
|
bool need_update = false;
|
|
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
if (node->type == SH_NODE_VECTOR_MATH) {
|
|
bNodeSocket *sockOutValue = nodeFindSocket(node, SOCK_OUT, "Value");
|
|
if (node->custom1 == NODE_VECTOR_MATH_NORMALIZE && socket_is_used(sockOutValue)) {
|
|
bNodeSocket *sockOutVector = nodeFindSocket(node, SOCK_OUT, "Vector");
|
|
if (socket_is_used(sockOutVector)) {
|
|
bNode *lengthNode = nodeAddStaticNode(NULL, ntree, SH_NODE_VECTOR_MATH);
|
|
lengthNode->custom1 = NODE_VECTOR_MATH_LENGTH;
|
|
lengthNode->locx = node->locx + node->width + 20.0f;
|
|
lengthNode->locy = node->locy;
|
|
bNodeSocket *sockLengthValue = nodeFindSocket(lengthNode, SOCK_OUT, "Value");
|
|
|
|
LISTBASE_FOREACH_BACKWARD_MUTABLE (bNodeLink *, link, &ntree->links) {
|
|
if (link->fromsock == sockOutValue) {
|
|
nodeAddLink(ntree, lengthNode, sockLengthValue, link->tonode, link->tosock);
|
|
nodeRemLink(ntree, link);
|
|
}
|
|
}
|
|
bNodeSocket *sockA = BLI_findlink(&node->inputs, 0);
|
|
bNodeSocket *sockLengthA = BLI_findlink(&lengthNode->inputs, 0);
|
|
if (sockA->link) {
|
|
bNodeLink *link = sockA->link;
|
|
nodeAddLink(ntree, link->fromnode, link->fromsock, lengthNode, sockLengthA);
|
|
}
|
|
else {
|
|
copy_v3_v3(cycles_node_socket_vector_value(sockLengthA),
|
|
cycles_node_socket_vector_value(sockA));
|
|
}
|
|
|
|
need_update = true;
|
|
}
|
|
else {
|
|
node->custom1 = NODE_VECTOR_MATH_LENGTH;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (need_update) {
|
|
ntreeUpdateTree(NULL, ntree);
|
|
}
|
|
}
|
|
|
|
/* The Vector Math operator types didn't have an enum, but rather, their
|
|
* values were hard coded into the code. After the enum was created and
|
|
* after more vector operators were added, the hard coded values needs
|
|
* to be remapped to their correct enum values. To fix this, we remap
|
|
* the values according to the following rules:
|
|
*
|
|
* Dot Product Operator : 3 -> 7
|
|
* Normalize Operator : 5 -> 11
|
|
*
|
|
* Additionally, since the Average operator was removed, it is assigned
|
|
* a value of -1 just to be identified later in the versioning code:
|
|
*
|
|
* Average Operator : 2 -> -1
|
|
*
|
|
*/
|
|
static void update_vector_math_node_operators_enum_mapping(bNodeTree *ntree)
|
|
{
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
if (node->type == SH_NODE_VECTOR_MATH) {
|
|
switch (node->custom1) {
|
|
case 2:
|
|
node->custom1 = -1;
|
|
break;
|
|
case 3:
|
|
node->custom1 = 7;
|
|
break;
|
|
case 5:
|
|
node->custom1 = 11;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/* The Average operator is no longer available in the Vector Math node.
|
|
* The Vector output was equal to the normalized sum of input vectors while
|
|
* the Value output was equal to the length of the sum of input vectors.
|
|
* To correct this, we convert the node into an Add node and add a length
|
|
* node or a normalize node if needed.
|
|
*/
|
|
static void update_vector_math_node_average_operator(bNodeTree *ntree)
|
|
{
|
|
bool need_update = false;
|
|
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
if (node->type == SH_NODE_VECTOR_MATH) {
|
|
/* See update_vector_math_node_operators_enum_mapping. */
|
|
if (node->custom1 == -1) {
|
|
node->custom1 = NODE_VECTOR_MATH_ADD;
|
|
bNodeSocket *sockOutVector = nodeFindSocket(node, SOCK_OUT, "Vector");
|
|
if (socket_is_used(sockOutVector)) {
|
|
bNode *normalizeNode = nodeAddStaticNode(NULL, ntree, SH_NODE_VECTOR_MATH);
|
|
normalizeNode->custom1 = NODE_VECTOR_MATH_NORMALIZE;
|
|
normalizeNode->locx = node->locx + node->width + 20.0f;
|
|
normalizeNode->locy = node->locy;
|
|
bNodeSocket *sockNormalizeOut = nodeFindSocket(normalizeNode, SOCK_OUT, "Vector");
|
|
|
|
LISTBASE_FOREACH_BACKWARD_MUTABLE (bNodeLink *, link, &ntree->links) {
|
|
if (link->fromsock == sockOutVector) {
|
|
nodeAddLink(ntree, normalizeNode, sockNormalizeOut, link->tonode, link->tosock);
|
|
nodeRemLink(ntree, link);
|
|
}
|
|
}
|
|
bNodeSocket *sockNormalizeA = BLI_findlink(&normalizeNode->inputs, 0);
|
|
nodeAddLink(ntree, node, sockOutVector, normalizeNode, sockNormalizeA);
|
|
|
|
need_update = true;
|
|
}
|
|
|
|
bNodeSocket *sockOutValue = nodeFindSocket(node, SOCK_OUT, "Value");
|
|
if (socket_is_used(sockOutValue)) {
|
|
bNode *lengthNode = nodeAddStaticNode(NULL, ntree, SH_NODE_VECTOR_MATH);
|
|
lengthNode->custom1 = NODE_VECTOR_MATH_LENGTH;
|
|
lengthNode->locx = node->locx + node->width + 20.0f;
|
|
if (socket_is_used(sockOutVector)) {
|
|
lengthNode->locy = node->locy - lengthNode->height - 20.0f;
|
|
}
|
|
else {
|
|
lengthNode->locy = node->locy;
|
|
}
|
|
bNodeSocket *sockLengthOut = nodeFindSocket(lengthNode, SOCK_OUT, "Value");
|
|
|
|
LISTBASE_FOREACH_BACKWARD_MUTABLE (bNodeLink *, link, &ntree->links) {
|
|
if (link->fromsock == sockOutValue) {
|
|
nodeAddLink(ntree, lengthNode, sockLengthOut, link->tonode, link->tosock);
|
|
nodeRemLink(ntree, link);
|
|
}
|
|
}
|
|
bNodeSocket *sockLengthA = BLI_findlink(&lengthNode->inputs, 0);
|
|
nodeAddLink(ntree, node, sockOutVector, lengthNode, sockLengthA);
|
|
|
|
need_update = true;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if (need_update) {
|
|
ntreeUpdateTree(NULL, ntree);
|
|
}
|
|
}
|
|
|
|
/* The Noise node now have a dimension property. This property should be
|
|
* initialized to 3 by default.
|
|
*/
|
|
static void update_noise_node_dimensions(bNodeTree *ntree)
|
|
{
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
if (node->type == SH_NODE_TEX_NOISE && node->storage) {
|
|
NodeTexNoise *tex = (NodeTexNoise *)node->storage;
|
|
tex->dimensions = 3;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* This structure is only used to pass data to
|
|
* update_mapping_node_fcurve_rna_path_callback.
|
|
*/
|
|
typedef struct {
|
|
char *nodePath;
|
|
bNode *minimumNode;
|
|
bNode *maximumNode;
|
|
} MappingNodeFCurveCallbackData;
|
|
|
|
/* This callback function is used by update_mapping_node_inputs_and_properties.
|
|
* It is executed on every fcurve in the nodetree id updating its RNA paths. The
|
|
* paths needs to be updated because the node properties became inputs.
|
|
*
|
|
* nodes["Mapping"].translation --> nodes["Mapping"].inputs[1].default_value
|
|
* nodes["Mapping"].rotation --> nodes["Mapping"].inputs[2].default_value
|
|
* nodes["Mapping"].scale --> nodes["Mapping"].inputs[3].default_value
|
|
* nodes["Mapping"].max --> nodes["Maximum"].inputs[1].default_value
|
|
* nodes["Mapping"].min --> nodes["Minimum"].inputs[1].default_value
|
|
*
|
|
* The fcurve can be that of any node or property in the nodetree, so we only
|
|
* update if the rna path starts with the rna path of the mapping node and
|
|
* doesn't end with "default_value", that is, not the Vector input.
|
|
*/
|
|
static void update_mapping_node_fcurve_rna_path_callback(ID *UNUSED(id),
|
|
FCurve *fcurve,
|
|
void *_data)
|
|
{
|
|
MappingNodeFCurveCallbackData *data = (MappingNodeFCurveCallbackData *)_data;
|
|
if (!STRPREFIX(fcurve->rna_path, data->nodePath) ||
|
|
BLI_str_endswith(fcurve->rna_path, "default_value")) {
|
|
return;
|
|
}
|
|
char *old_fcurve_rna_path = fcurve->rna_path;
|
|
|
|
if (BLI_str_endswith(old_fcurve_rna_path, "translation")) {
|
|
fcurve->rna_path = BLI_sprintfN("%s.%s", data->nodePath, "inputs[1].default_value");
|
|
}
|
|
else if (BLI_str_endswith(old_fcurve_rna_path, "rotation")) {
|
|
fcurve->rna_path = BLI_sprintfN("%s.%s", data->nodePath, "inputs[2].default_value");
|
|
}
|
|
else if (BLI_str_endswith(old_fcurve_rna_path, "scale")) {
|
|
fcurve->rna_path = BLI_sprintfN("%s.%s", data->nodePath, "inputs[3].default_value");
|
|
}
|
|
else if (data->minimumNode && BLI_str_endswith(old_fcurve_rna_path, "max")) {
|
|
char node_name_esc[sizeof(data->minimumNode->name) * 2];
|
|
BLI_str_escape(node_name_esc, data->minimumNode->name, sizeof(node_name_esc));
|
|
fcurve->rna_path = BLI_sprintfN("nodes[\"%s\"].%s", node_name_esc, "inputs[1].default_value");
|
|
}
|
|
else if (data->maximumNode && BLI_str_endswith(old_fcurve_rna_path, "min")) {
|
|
char node_name_esc[sizeof(data->maximumNode->name) * 2];
|
|
BLI_str_escape(node_name_esc, data->maximumNode->name, sizeof(node_name_esc));
|
|
fcurve->rna_path = BLI_sprintfN("nodes[\"%s\"].%s", node_name_esc, "inputs[1].default_value");
|
|
}
|
|
|
|
if (fcurve->rna_path != old_fcurve_rna_path) {
|
|
MEM_freeN(old_fcurve_rna_path);
|
|
}
|
|
}
|
|
|
|
/* The Mapping node has been rewritten to support dynamic inputs. Previously,
|
|
* the transformation information was stored in a TexMapping struct in the
|
|
* node->storage member of bNode. Currently, the transformation information
|
|
* is stored in input sockets. To correct this, we transfer the information
|
|
* from the TexMapping struct to the input sockets.
|
|
*
|
|
* Additionally, the Minimum and Maximum properties are no longer available
|
|
* in the node. To correct this, a Vector Minimum and/or a Vector Maximum
|
|
* nodes are added if needed.
|
|
*
|
|
* Finally, the TexMapping struct is freed and node->storage is set to NULL.
|
|
*
|
|
* Since the RNA paths of the properties changed, we also have to update the
|
|
* rna_path of the FCurves if they exist. To do that, we loop over FCurves
|
|
* and check if they control a property of the node, if they do, we update
|
|
* the path to be that of the corresponding socket in the node or the added
|
|
* minimum/maximum node.
|
|
*
|
|
*/
|
|
static void update_mapping_node_inputs_and_properties(bNodeTree *ntree)
|
|
{
|
|
bool need_update = false;
|
|
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
/* If node->storage is NULL, then conversion has already taken place.
|
|
* This can happen if a file with the new mapping node [saved from (2, 81, 8) or newer]
|
|
* is opened in a blender version prior to (2, 81, 8) and saved from there again. */
|
|
if (node->type == SH_NODE_MAPPING && node->storage) {
|
|
TexMapping *mapping = (TexMapping *)node->storage;
|
|
node->custom1 = mapping->type;
|
|
node->width = 140.0f;
|
|
|
|
bNodeSocket *sockLocation = nodeFindSocket(node, SOCK_IN, "Location");
|
|
copy_v3_v3(cycles_node_socket_vector_value(sockLocation), mapping->loc);
|
|
bNodeSocket *sockRotation = nodeFindSocket(node, SOCK_IN, "Rotation");
|
|
copy_v3_v3(cycles_node_socket_vector_value(sockRotation), mapping->rot);
|
|
bNodeSocket *sockScale = nodeFindSocket(node, SOCK_IN, "Scale");
|
|
copy_v3_v3(cycles_node_socket_vector_value(sockScale), mapping->size);
|
|
|
|
bNode *maximumNode = NULL;
|
|
if (mapping->flag & TEXMAP_CLIP_MIN) {
|
|
maximumNode = nodeAddStaticNode(NULL, ntree, SH_NODE_VECTOR_MATH);
|
|
maximumNode->custom1 = NODE_VECTOR_MATH_MAXIMUM;
|
|
if (mapping->flag & TEXMAP_CLIP_MAX) {
|
|
maximumNode->locx = node->locx + (node->width + 20.0f) * 2.0f;
|
|
}
|
|
else {
|
|
maximumNode->locx = node->locx + node->width + 20.0f;
|
|
}
|
|
maximumNode->locy = node->locy;
|
|
bNodeSocket *sockMaximumB = BLI_findlink(&maximumNode->inputs, 1);
|
|
copy_v3_v3(cycles_node_socket_vector_value(sockMaximumB), mapping->min);
|
|
bNodeSocket *sockMappingResult = nodeFindSocket(node, SOCK_OUT, "Vector");
|
|
|
|
LISTBASE_FOREACH_BACKWARD_MUTABLE (bNodeLink *, link, &ntree->links) {
|
|
if (link->fromsock == sockMappingResult) {
|
|
bNodeSocket *sockMaximumResult = nodeFindSocket(maximumNode, SOCK_OUT, "Vector");
|
|
nodeAddLink(ntree, maximumNode, sockMaximumResult, link->tonode, link->tosock);
|
|
nodeRemLink(ntree, link);
|
|
}
|
|
}
|
|
if (!(mapping->flag & TEXMAP_CLIP_MAX)) {
|
|
bNodeSocket *sockMaximumA = BLI_findlink(&maximumNode->inputs, 0);
|
|
nodeAddLink(ntree, node, sockMappingResult, maximumNode, sockMaximumA);
|
|
}
|
|
|
|
need_update = true;
|
|
}
|
|
|
|
bNode *minimumNode = NULL;
|
|
if (mapping->flag & TEXMAP_CLIP_MAX) {
|
|
minimumNode = nodeAddStaticNode(NULL, ntree, SH_NODE_VECTOR_MATH);
|
|
minimumNode->custom1 = NODE_VECTOR_MATH_MINIMUM;
|
|
minimumNode->locx = node->locx + node->width + 20.0f;
|
|
minimumNode->locy = node->locy;
|
|
bNodeSocket *sockMinimumB = BLI_findlink(&minimumNode->inputs, 1);
|
|
copy_v3_v3(cycles_node_socket_vector_value(sockMinimumB), mapping->max);
|
|
|
|
bNodeSocket *sockMinimumResult = nodeFindSocket(minimumNode, SOCK_OUT, "Vector");
|
|
bNodeSocket *sockMappingResult = nodeFindSocket(node, SOCK_OUT, "Vector");
|
|
|
|
if (maximumNode) {
|
|
bNodeSocket *sockMaximumA = BLI_findlink(&maximumNode->inputs, 0);
|
|
nodeAddLink(ntree, minimumNode, sockMinimumResult, maximumNode, sockMaximumA);
|
|
}
|
|
else {
|
|
LISTBASE_FOREACH_BACKWARD_MUTABLE (bNodeLink *, link, &ntree->links) {
|
|
if (link->fromsock == sockMappingResult) {
|
|
nodeAddLink(ntree, minimumNode, sockMinimumResult, link->tonode, link->tosock);
|
|
nodeRemLink(ntree, link);
|
|
}
|
|
}
|
|
}
|
|
bNodeSocket *sockMinimumA = BLI_findlink(&minimumNode->inputs, 0);
|
|
nodeAddLink(ntree, node, sockMappingResult, minimumNode, sockMinimumA);
|
|
|
|
need_update = true;
|
|
}
|
|
|
|
MEM_freeN(node->storage);
|
|
node->storage = NULL;
|
|
|
|
char node_name_esc[sizeof(node->name) * 2];
|
|
BLI_str_escape(node_name_esc, node->name, sizeof(node_name_esc));
|
|
|
|
char *nodePath = BLI_sprintfN("nodes[\"%s\"]", node_name_esc);
|
|
MappingNodeFCurveCallbackData data = {nodePath, minimumNode, maximumNode};
|
|
BKE_fcurves_id_cb(&ntree->id, update_mapping_node_fcurve_rna_path_callback, &data);
|
|
MEM_freeN(nodePath);
|
|
}
|
|
}
|
|
|
|
if (need_update) {
|
|
ntreeUpdateTree(NULL, ntree);
|
|
}
|
|
}
|
|
|
|
/* The Musgrave node now has a dimension property. This property should
|
|
* be initialized to 3 by default.
|
|
*/
|
|
static void update_musgrave_node_dimensions(bNodeTree *ntree)
|
|
{
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
if (node->type == SH_NODE_TEX_MUSGRAVE && node->storage) {
|
|
NodeTexMusgrave *tex = (NodeTexMusgrave *)node->storage;
|
|
tex->dimensions = 3;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* The Color output of the Musgrave node has been removed. Previously, this
|
|
* output was just equal to the Fac output. To correct this, we move links
|
|
* from the Color output to the Fac output if they exist.
|
|
*/
|
|
static void update_musgrave_node_color_output(bNodeTree *ntree)
|
|
{
|
|
LISTBASE_FOREACH (bNodeLink *, link, &ntree->links) {
|
|
if (link->fromnode && link->fromnode->type == SH_NODE_TEX_MUSGRAVE) {
|
|
if (link->fromsock->type == SOCK_RGBA) {
|
|
link->fromsock = link->fromsock->next;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/* The Voronoi node now have a dimension property. This property should be
|
|
* initialized to 3 by default.
|
|
*/
|
|
static void update_voronoi_node_dimensions(bNodeTree *ntree)
|
|
{
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
if (node->type == SH_NODE_TEX_VORONOI && node->storage) {
|
|
NodeTexVoronoi *tex = (NodeTexVoronoi *)node->storage;
|
|
tex->dimensions = 3;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* The F3 and F4 features of the Voronoi node have been removed.
|
|
* To correct this, we set the feature type to be F2 if it is F3
|
|
* or F4. The SHD_VORONOI_F3 and SHD_VORONOI_F4 enum values were
|
|
* 2 and 3 respectively.
|
|
*/
|
|
static void update_voronoi_node_f3_and_f4(bNodeTree *ntree)
|
|
{
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
if (node->type == SH_NODE_TEX_VORONOI && node->storage) {
|
|
NodeTexVoronoi *tex = (NodeTexVoronoi *)node->storage;
|
|
if (ELEM(tex->feature, 2, 3)) {
|
|
tex->feature = SHD_VORONOI_F2;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/* The Fac output of the Voronoi node has been removed. Previously, this
|
|
* output was the voronoi distance in the Intensity mode and the Cell ID
|
|
* in the Cell mode. To correct this, we update the identifier and name
|
|
* of the Fac socket such that it gets mapped to the Distance socket.
|
|
* This is supposed to work with update_voronoi_node_coloring.
|
|
*/
|
|
static void update_voronoi_node_fac_output(bNodeTree *ntree)
|
|
{
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
if (node->type == SH_NODE_TEX_VORONOI) {
|
|
bNodeSocket *facOutput = BLI_findlink(&node->outputs, 1);
|
|
strcpy(facOutput->identifier, "Distance");
|
|
strcpy(facOutput->name, "Distance");
|
|
}
|
|
}
|
|
}
|
|
|
|
/* The Crackle feature of the Voronoi node has been removed. Previously,
|
|
* this feature returned the F2 distance minus the F1 distance. The
|
|
* crackle feature had an enum value of 4. To fix this we do the
|
|
* following:
|
|
*
|
|
* 1. The node feature is set to F1.
|
|
* 2. A new Voronoi node is added and its feature is set to F2.
|
|
* 3. The properties, input values, and connections are copied
|
|
* from the node to the new Voronoi node so that they match
|
|
* exactly.
|
|
* 4. A Subtract node is added.
|
|
* 5. The outputs of the F1 and F2 voronoi are connected to
|
|
* the inputs of the subtract node.
|
|
* 6. The output of the subtract node is connected to the
|
|
* appropriate sockets.
|
|
*
|
|
*/
|
|
static void update_voronoi_node_crackle(bNodeTree *ntree)
|
|
{
|
|
bool need_update = false;
|
|
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
if (node->type == SH_NODE_TEX_VORONOI && node->storage) {
|
|
NodeTexVoronoi *tex = (NodeTexVoronoi *)node->storage;
|
|
bNodeSocket *sockDistance = nodeFindSocket(node, SOCK_OUT, "Distance");
|
|
bNodeSocket *sockColor = nodeFindSocket(node, SOCK_OUT, "Color");
|
|
if (tex->feature == 4 && (socket_is_used(sockDistance) || socket_is_used(sockColor))) {
|
|
tex->feature = SHD_VORONOI_F1;
|
|
|
|
bNode *voronoiNode = nodeAddStaticNode(NULL, ntree, SH_NODE_TEX_VORONOI);
|
|
NodeTexVoronoi *texVoronoi = (NodeTexVoronoi *)voronoiNode->storage;
|
|
texVoronoi->feature = SHD_VORONOI_F2;
|
|
texVoronoi->distance = tex->distance;
|
|
texVoronoi->dimensions = 3;
|
|
voronoiNode->locx = node->locx + node->width + 20.0f;
|
|
voronoiNode->locy = node->locy;
|
|
|
|
bNodeSocket *sockVector = nodeFindSocket(node, SOCK_IN, "Vector");
|
|
bNodeSocket *sockScale = nodeFindSocket(node, SOCK_IN, "Scale");
|
|
bNodeSocket *sockExponent = nodeFindSocket(node, SOCK_IN, "Exponent");
|
|
bNodeSocket *sockVoronoiVector = nodeFindSocket(voronoiNode, SOCK_IN, "Vector");
|
|
bNodeSocket *sockVoronoiScale = nodeFindSocket(voronoiNode, SOCK_IN, "Scale");
|
|
bNodeSocket *sockVoronoiExponent = nodeFindSocket(voronoiNode, SOCK_IN, "Exponent");
|
|
if (sockVector->link) {
|
|
nodeAddLink(ntree,
|
|
sockVector->link->fromnode,
|
|
sockVector->link->fromsock,
|
|
voronoiNode,
|
|
sockVoronoiVector);
|
|
}
|
|
*cycles_node_socket_float_value(sockVoronoiScale) = *cycles_node_socket_float_value(
|
|
sockScale);
|
|
if (sockScale->link) {
|
|
nodeAddLink(ntree,
|
|
sockScale->link->fromnode,
|
|
sockScale->link->fromsock,
|
|
voronoiNode,
|
|
sockVoronoiScale);
|
|
}
|
|
*cycles_node_socket_float_value(sockVoronoiExponent) = *cycles_node_socket_float_value(
|
|
sockExponent);
|
|
if (sockExponent->link) {
|
|
nodeAddLink(ntree,
|
|
sockExponent->link->fromnode,
|
|
sockExponent->link->fromsock,
|
|
voronoiNode,
|
|
sockVoronoiExponent);
|
|
}
|
|
|
|
bNode *subtractNode = nodeAddStaticNode(NULL, ntree, SH_NODE_MATH);
|
|
subtractNode->custom1 = NODE_MATH_SUBTRACT;
|
|
subtractNode->locx = voronoiNode->locx + voronoiNode->width + 20.0f;
|
|
subtractNode->locy = voronoiNode->locy;
|
|
bNodeSocket *sockSubtractOutValue = nodeFindSocket(subtractNode, SOCK_OUT, "Value");
|
|
|
|
LISTBASE_FOREACH_BACKWARD_MUTABLE (bNodeLink *, link, &ntree->links) {
|
|
if (link->fromnode == node) {
|
|
nodeAddLink(ntree, subtractNode, sockSubtractOutValue, link->tonode, link->tosock);
|
|
nodeRemLink(ntree, link);
|
|
}
|
|
}
|
|
|
|
bNodeSocket *sockDistanceF1 = nodeFindSocket(node, SOCK_OUT, "Distance");
|
|
bNodeSocket *sockDistanceF2 = nodeFindSocket(voronoiNode, SOCK_OUT, "Distance");
|
|
bNodeSocket *sockSubtractA = BLI_findlink(&subtractNode->inputs, 0);
|
|
bNodeSocket *sockSubtractB = BLI_findlink(&subtractNode->inputs, 1);
|
|
|
|
nodeAddLink(ntree, node, sockDistanceF1, subtractNode, sockSubtractB);
|
|
nodeAddLink(ntree, voronoiNode, sockDistanceF2, subtractNode, sockSubtractA);
|
|
|
|
need_update = true;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (need_update) {
|
|
ntreeUpdateTree(NULL, ntree);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* The coloring property of the Voronoi node was removed. Previously,
|
|
* if the coloring enum was set to Intensity (0), the voronoi distance
|
|
* was returned in all outputs, otherwise, the Cell ID was returned.
|
|
* Since we remapped the Fac output in update_voronoi_node_fac_output,
|
|
* then to fix this, we relink the Color output to the Distance
|
|
* output if coloring was set to 0, and the other way around otherwise.
|
|
*/
|
|
static void update_voronoi_node_coloring(bNodeTree *ntree)
|
|
{
|
|
bool need_update = false;
|
|
|
|
LISTBASE_FOREACH_BACKWARD_MUTABLE (bNodeLink *, link, &ntree->links) {
|
|
bNode *node = link->fromnode;
|
|
if (node && node->type == SH_NODE_TEX_VORONOI && node->storage) {
|
|
NodeTexVoronoi *tex = (NodeTexVoronoi *)node->storage;
|
|
if (tex->coloring == 0) {
|
|
bNodeSocket *sockColor = nodeFindSocket(node, SOCK_OUT, "Color");
|
|
if (link->fromsock == sockColor) {
|
|
bNodeSocket *sockDistance = nodeFindSocket(node, SOCK_OUT, "Distance");
|
|
nodeAddLink(ntree, node, sockDistance, link->tonode, link->tosock);
|
|
nodeRemLink(ntree, link);
|
|
need_update = true;
|
|
}
|
|
}
|
|
else {
|
|
bNodeSocket *sockDistance = nodeFindSocket(node, SOCK_OUT, "Distance");
|
|
if (link->fromsock == sockDistance) {
|
|
bNodeSocket *sockColor = nodeFindSocket(node, SOCK_OUT, "Color");
|
|
nodeAddLink(ntree, node, sockColor, link->tonode, link->tosock);
|
|
nodeRemLink(ntree, link);
|
|
need_update = true;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if (need_update) {
|
|
ntreeUpdateTree(NULL, ntree);
|
|
}
|
|
}
|
|
|
|
/* Previously, the output euclidean distance was actually the squared
|
|
* euclidean distance. To fix this, we square the output distance
|
|
* socket if the distance metric is set to SHD_VORONOI_EUCLIDEAN.
|
|
*/
|
|
static void update_voronoi_node_square_distance(bNodeTree *ntree)
|
|
{
|
|
bool need_update = false;
|
|
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
if (node->type == SH_NODE_TEX_VORONOI && node->storage) {
|
|
NodeTexVoronoi *tex = (NodeTexVoronoi *)node->storage;
|
|
bNodeSocket *sockDistance = nodeFindSocket(node, SOCK_OUT, "Distance");
|
|
if (tex->distance == SHD_VORONOI_EUCLIDEAN &&
|
|
(ELEM(tex->feature, SHD_VORONOI_F1, SHD_VORONOI_F2)) && socket_is_used(sockDistance)) {
|
|
bNode *multiplyNode = nodeAddStaticNode(NULL, ntree, SH_NODE_MATH);
|
|
multiplyNode->custom1 = NODE_MATH_MULTIPLY;
|
|
multiplyNode->locx = node->locx + node->width + 20.0f;
|
|
multiplyNode->locy = node->locy;
|
|
|
|
bNodeSocket *sockValue = nodeFindSocket(multiplyNode, SOCK_OUT, "Value");
|
|
LISTBASE_FOREACH_BACKWARD_MUTABLE (bNodeLink *, link, &ntree->links) {
|
|
if (link->fromsock == sockDistance) {
|
|
nodeAddLink(ntree, multiplyNode, sockValue, link->tonode, link->tosock);
|
|
nodeRemLink(ntree, link);
|
|
}
|
|
}
|
|
|
|
bNodeSocket *sockMultiplyA = BLI_findlink(&multiplyNode->inputs, 0);
|
|
bNodeSocket *sockMultiplyB = BLI_findlink(&multiplyNode->inputs, 1);
|
|
|
|
nodeAddLink(ntree, node, sockDistance, multiplyNode, sockMultiplyA);
|
|
nodeAddLink(ntree, node, sockDistance, multiplyNode, sockMultiplyB);
|
|
|
|
need_update = true;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (need_update) {
|
|
ntreeUpdateTree(NULL, ntree);
|
|
}
|
|
}
|
|
|
|
/* Noise and Wave Texture nodes: Restore previous Distortion range.
|
|
* In 2.81 we used noise() for distortion, now we use snoise() which has twice the range.
|
|
* To fix this we halve distortion value, directly or by adding multiply node for used sockets.
|
|
*/
|
|
static void update_noise_and_wave_distortion(bNodeTree *ntree)
|
|
{
|
|
bool need_update = false;
|
|
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
if (ELEM(node->type, SH_NODE_TEX_NOISE, SH_NODE_TEX_WAVE)) {
|
|
|
|
bNodeSocket *sockDistortion = nodeFindSocket(node, SOCK_IN, "Distortion");
|
|
float *distortion = cycles_node_socket_float_value(sockDistortion);
|
|
|
|
if (socket_is_used(sockDistortion) && sockDistortion->link != NULL) {
|
|
bNode *distortionInputNode = sockDistortion->link->fromnode;
|
|
bNodeSocket *distortionInputSock = sockDistortion->link->fromsock;
|
|
|
|
bNode *mulNode = nodeAddStaticNode(NULL, ntree, SH_NODE_MATH);
|
|
mulNode->custom1 = NODE_MATH_MULTIPLY;
|
|
mulNode->locx = node->locx;
|
|
mulNode->locy = node->locy - 240.0f;
|
|
mulNode->flag |= NODE_HIDDEN;
|
|
bNodeSocket *mulSockA = BLI_findlink(&mulNode->inputs, 0);
|
|
bNodeSocket *mulSockB = BLI_findlink(&mulNode->inputs, 1);
|
|
*cycles_node_socket_float_value(mulSockB) = 0.5f;
|
|
bNodeSocket *mulSockOut = nodeFindSocket(mulNode, SOCK_OUT, "Value");
|
|
|
|
nodeRemLink(ntree, sockDistortion->link);
|
|
nodeAddLink(ntree, distortionInputNode, distortionInputSock, mulNode, mulSockA);
|
|
nodeAddLink(ntree, mulNode, mulSockOut, node, sockDistortion);
|
|
|
|
need_update = true;
|
|
}
|
|
else if (*distortion != 0.0f) {
|
|
*distortion = *distortion * 0.5f;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (need_update) {
|
|
ntreeUpdateTree(NULL, ntree);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Wave Texture node: Restore previous texture directions and offset.
|
|
* 1. In 2.81, Wave texture had fixed diagonal direction (Bands) or
|
|
* mapping along distance (Rings). Now, directions are customizable
|
|
* properties, with X axis being new default. To fix this we set new
|
|
* direction options to Diagonal and Spherical.
|
|
* 2. Sine profile is now negatively offset by PI/2 to better match
|
|
* other profiles. To fix this we set new Phase Offset input to PI/2
|
|
* in nodes with Sine profile.
|
|
*/
|
|
static void update_wave_node_directions_and_offset(bNodeTree *ntree)
|
|
{
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
if (node->type == SH_NODE_TEX_WAVE) {
|
|
NodeTexWave *tex = (NodeTexWave *)node->storage;
|
|
tex->bands_direction = SHD_WAVE_BANDS_DIRECTION_DIAGONAL;
|
|
tex->rings_direction = SHD_WAVE_RINGS_DIRECTION_SPHERICAL;
|
|
|
|
if (tex->wave_profile == SHD_WAVE_PROFILE_SIN) {
|
|
bNodeSocket *sockPhaseOffset = nodeFindSocket(node, SOCK_IN, "Phase Offset");
|
|
*cycles_node_socket_float_value(sockPhaseOffset) = M_PI_2;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void blo_do_versions_cycles(FileData *UNUSED(fd), Library *UNUSED(lib), Main *bmain)
|
|
{
|
|
/* Particle shape shared with Eevee. */
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 280, 16)) {
|
|
for (ParticleSettings *part = bmain->particles.first; part; part = part->id.next) {
|
|
IDProperty *cpart = cycles_properties_from_ID(&part->id);
|
|
|
|
if (cpart) {
|
|
part->shape = cycles_property_float(cpart, "shape", 0.0);
|
|
part->rad_root = cycles_property_float(cpart, "root_width", 1.0);
|
|
part->rad_tip = cycles_property_float(cpart, "tip_width", 0.0);
|
|
part->rad_scale = cycles_property_float(cpart, "radius_scale", 0.01);
|
|
if (cycles_property_boolean(cpart, "use_closetip", true)) {
|
|
part->shape_flag |= PART_SHAPE_CLOSE_TIP;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 280, 68)) {
|
|
/* Unify Cycles and Eevee film transparency. */
|
|
for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
|
|
if (STREQ(scene->r.engine, RE_engine_id_CYCLES)) {
|
|
IDProperty *cscene = cycles_properties_from_ID(&scene->id);
|
|
if (cscene) {
|
|
bool cycles_film_transparency = cycles_property_boolean(
|
|
cscene, "film_transparent", false);
|
|
scene->r.alphamode = cycles_film_transparency ? R_ALPHAPREMUL : R_ADDSKY;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 281, 3)) {
|
|
FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
|
|
if (ntree->type == NTREE_SHADER) {
|
|
update_vector_math_node_operators_enum_mapping(ntree);
|
|
}
|
|
}
|
|
FOREACH_NODETREE_END;
|
|
}
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 281, 10)) {
|
|
FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
|
|
if (ntree->type == NTREE_SHADER) {
|
|
update_musgrave_node_color_output(ntree);
|
|
}
|
|
}
|
|
FOREACH_NODETREE_END;
|
|
}
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 281, 11)) {
|
|
FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
|
|
if (ntree->type == NTREE_SHADER) {
|
|
update_voronoi_node_f3_and_f4(ntree);
|
|
update_voronoi_node_fac_output(ntree);
|
|
}
|
|
}
|
|
FOREACH_NODETREE_END;
|
|
}
|
|
}
|
|
|
|
void do_versions_after_linking_cycles(Main *bmain)
|
|
{
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 280, 66)) {
|
|
/* Shader node tree changes. After lib linking so we have all the typeinfo
|
|
* pointers and updated sockets and we can use the high level node API to
|
|
* manipulate nodes. */
|
|
FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
|
|
if (ntree->type != NTREE_SHADER) {
|
|
continue;
|
|
}
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 273, 5)) {
|
|
/* Euler order was ZYX in previous versions. */
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
mapping_node_order_flip(node);
|
|
}
|
|
}
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 276, 6)) {
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
vector_curve_node_remap(node);
|
|
}
|
|
}
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 279, 2) ||
|
|
(MAIN_VERSION_ATLEAST(bmain, 280, 0) && !MAIN_VERSION_ATLEAST(bmain, 280, 4))) {
|
|
displacement_node_insert(ntree);
|
|
}
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 279, 3)) {
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
displacement_principled_nodes(node);
|
|
}
|
|
}
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 279, 4) ||
|
|
(MAIN_VERSION_ATLEAST(bmain, 280, 0) && !MAIN_VERSION_ATLEAST(bmain, 280, 5))) {
|
|
/* Switch to squared roughness convention */
|
|
square_roughness_node_insert(ntree);
|
|
}
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 279, 5)) {
|
|
ambient_occlusion_node_relink(ntree);
|
|
}
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 280, 66)) {
|
|
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
|
|
image_node_colorspace(node);
|
|
}
|
|
}
|
|
}
|
|
FOREACH_NODETREE_END;
|
|
}
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 280, 64)) {
|
|
/* Unify Cycles and Eevee settings. */
|
|
Scene *scene = bmain->scenes.first;
|
|
const char *engine = (scene) ? scene->r.engine : "CYCLES";
|
|
|
|
for (Light *light = bmain->lights.first; light; light = light->id.next) {
|
|
light_emission_unify(light, engine);
|
|
}
|
|
}
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 280, 69)) {
|
|
/* Unify Cycles and Eevee depth of field. */
|
|
Scene *scene = bmain->scenes.first;
|
|
const char *engine = (scene) ? scene->r.engine : "CYCLES";
|
|
|
|
if (STREQ(engine, RE_engine_id_CYCLES)) {
|
|
for (Camera *camera = bmain->cameras.first; camera; camera = camera->id.next) {
|
|
IDProperty *ccamera = cycles_properties_from_ID(&camera->id);
|
|
if (ccamera) {
|
|
const bool is_fstop = cycles_property_int(ccamera, "aperture_type", 0) == 1;
|
|
|
|
camera->dof.aperture_fstop = cycles_property_float(ccamera, "aperture_fstop", 5.6f);
|
|
camera->dof.aperture_blades = cycles_property_int(ccamera, "aperture_blades", 0);
|
|
camera->dof.aperture_rotation = cycles_property_float(ccamera, "aperture_rotation", 0.0);
|
|
camera->dof.aperture_ratio = cycles_property_float(ccamera, "aperture_ratio", 1.0f);
|
|
camera->dof.flag |= CAM_DOF_ENABLED;
|
|
|
|
float aperture_size = cycles_property_float(ccamera, "aperture_size", 0.0f);
|
|
|
|
if (is_fstop) {
|
|
continue;
|
|
}
|
|
if (aperture_size > 0.0f) {
|
|
if (camera->type == CAM_ORTHO) {
|
|
camera->dof.aperture_fstop = 1.0f / (2.0f * aperture_size);
|
|
}
|
|
else {
|
|
camera->dof.aperture_fstop = (camera->lens * 1e-3f) / (2.0f * aperture_size);
|
|
}
|
|
|
|
continue;
|
|
}
|
|
}
|
|
|
|
/* No depth of field, set default settings. */
|
|
camera->dof.aperture_fstop = 2.8f;
|
|
camera->dof.aperture_blades = 0;
|
|
camera->dof.aperture_rotation = 0.0f;
|
|
camera->dof.aperture_ratio = 1.0f;
|
|
camera->dof.flag &= ~CAM_DOF_ENABLED;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 281, 2)) {
|
|
FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
|
|
if (ntree->type == NTREE_SHADER) {
|
|
update_math_node_single_operand_operators(ntree);
|
|
}
|
|
}
|
|
FOREACH_NODETREE_END;
|
|
}
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 281, 3)) {
|
|
FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
|
|
if (ntree->type == NTREE_SHADER) {
|
|
update_vector_math_node_add_and_subtract_operators(ntree);
|
|
update_vector_math_node_dot_product_operator(ntree);
|
|
update_vector_math_node_cross_product_operator(ntree);
|
|
update_vector_math_node_normalize_operator(ntree);
|
|
update_vector_math_node_average_operator(ntree);
|
|
}
|
|
}
|
|
FOREACH_NODETREE_END;
|
|
}
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 281, 7)) {
|
|
FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
|
|
if (ntree->type == NTREE_SHADER) {
|
|
update_noise_node_dimensions(ntree);
|
|
}
|
|
}
|
|
FOREACH_NODETREE_END;
|
|
}
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 281, 8)) {
|
|
FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
|
|
if (ntree->type == NTREE_SHADER) {
|
|
update_mapping_node_inputs_and_properties(ntree);
|
|
}
|
|
}
|
|
FOREACH_NODETREE_END;
|
|
}
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 281, 10)) {
|
|
FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
|
|
if (ntree->type == NTREE_SHADER) {
|
|
update_musgrave_node_dimensions(ntree);
|
|
}
|
|
}
|
|
FOREACH_NODETREE_END;
|
|
}
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 281, 11)) {
|
|
FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
|
|
if (ntree->type == NTREE_SHADER) {
|
|
update_voronoi_node_dimensions(ntree);
|
|
update_voronoi_node_crackle(ntree);
|
|
update_voronoi_node_coloring(ntree);
|
|
update_voronoi_node_square_distance(ntree);
|
|
}
|
|
}
|
|
FOREACH_NODETREE_END;
|
|
}
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 282, 4)) {
|
|
FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
|
|
if (ntree->type == NTREE_SHADER) {
|
|
update_noise_and_wave_distortion(ntree);
|
|
}
|
|
}
|
|
FOREACH_NODETREE_END;
|
|
}
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 283, 4)) {
|
|
FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
|
|
if (ntree->type == NTREE_SHADER) {
|
|
update_wave_node_directions_and_offset(ntree);
|
|
}
|
|
}
|
|
FOREACH_NODETREE_END;
|
|
}
|
|
|
|
if (!MAIN_VERSION_ATLEAST(bmain, 290, 5)) {
|
|
/* New denoiser settings. */
|
|
for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
|
|
IDProperty *cscene = cycles_properties_from_ID(&scene->id);
|
|
|
|
/* Check if any view layers had (optix) denoising enabled. */
|
|
bool use_optix = false;
|
|
bool use_denoising = false;
|
|
for (ViewLayer *view_layer = scene->view_layers.first; view_layer;
|
|
view_layer = view_layer->next) {
|
|
IDProperty *cview_layer = cycles_properties_from_view_layer(view_layer);
|
|
if (cview_layer) {
|
|
use_denoising = use_denoising ||
|
|
cycles_property_boolean(cview_layer, "use_denoising", false);
|
|
use_optix = use_optix ||
|
|
cycles_property_boolean(cview_layer, "use_optix_denoising", false);
|
|
}
|
|
}
|
|
|
|
if (cscene) {
|
|
const int DENOISER_AUTO = 0;
|
|
const int DENOISER_NLM = 1;
|
|
const int DENOISER_OPTIX = 2;
|
|
|
|
/* Enable denoiser if it was enabled for one view layer before. */
|
|
cycles_property_int_set(cscene, "denoiser", (use_optix) ? DENOISER_OPTIX : DENOISER_NLM);
|
|
cycles_property_boolean_set(cscene, "use_denoising", use_denoising);
|
|
|
|
/* Migrate Optix denoiser to new settings. */
|
|
if (cycles_property_int(cscene, "preview_denoising", 0)) {
|
|
cycles_property_boolean_set(cscene, "use_preview_denoising", true);
|
|
cycles_property_int_set(cscene, "preview_denoiser", DENOISER_AUTO);
|
|
}
|
|
}
|
|
|
|
/* Enable denoising in all view layer if there was no denoising before,
|
|
* so that enabling the scene settings auto enables it for all view layers. */
|
|
if (!use_denoising) {
|
|
for (ViewLayer *view_layer = scene->view_layers.first; view_layer;
|
|
view_layer = view_layer->next) {
|
|
IDProperty *cview_layer = cycles_properties_from_view_layer(view_layer);
|
|
if (cview_layer) {
|
|
cycles_property_boolean_set(cview_layer, "use_denoising", true);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|