The root of the problem goes to the fact that node tree copying uses source tree and nodes for a temporary storage. This makes it so multiple dependency graphs can not be reliably evaluated from different threads if they are using same original node tree. Solved by doing the following: - Commonly used tree copying function (which is used by library manager) keeps source tree, nodes and sockets untouched. - All the related areas (like node tree's callback) now have const qualifier on the input. - Areas which needs to have those temporary pointers assigned are now using explicit function. Would be really cool to get rid of those temporary pointers completely, but this is a bit tricky due to hairy nature of the code. Can happen any time now though: is easy enough to generalize the new pointers mapping. Note that this change is only intended to solve the crash. The fact that icons shouldn't be updated on playback will be fixed as a separate change. Reviewers: brecht, fclem Reviewed By: brecht, fclem Subscribers: brecht, fclem Differential Revision: https://developer.blender.org/D5002
180 lines
4.8 KiB
C
180 lines
4.8 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.
|
|
*
|
|
* The Original Code is Copyright (C) 2006 Blender Foundation.
|
|
* All rights reserved.
|
|
*/
|
|
|
|
/** \file
|
|
* \ingroup texnodes
|
|
*/
|
|
|
|
#include "node_texture_util.h"
|
|
#include "NOD_texture.h"
|
|
|
|
/* **************** COMPOSITE ******************** */
|
|
static bNodeSocketTemplate inputs[] = {
|
|
{SOCK_RGBA, 1, N_("Color"), 0.0f, 0.0f, 0.0f, 1.0f},
|
|
{SOCK_VECTOR, 1, N_("Normal"), 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, PROP_DIRECTION},
|
|
{-1, 0, ""},
|
|
};
|
|
|
|
/* applies to render pipeline */
|
|
static void exec(void *data,
|
|
int UNUSED(thread),
|
|
bNode *node,
|
|
bNodeExecData *execdata,
|
|
bNodeStack **in,
|
|
bNodeStack **UNUSED(out))
|
|
{
|
|
TexCallData *cdata = (TexCallData *)data;
|
|
TexResult *target = cdata->target;
|
|
|
|
if (cdata->do_preview) {
|
|
TexParams params;
|
|
params_from_cdata(¶ms, cdata);
|
|
|
|
if (in[1] && in[1]->hasinput && !in[0]->hasinput) {
|
|
tex_input_rgba(&target->tr, in[1], ¶ms, cdata->thread);
|
|
}
|
|
else {
|
|
tex_input_rgba(&target->tr, in[0], ¶ms, cdata->thread);
|
|
}
|
|
tex_do_preview(execdata->preview, params.co, &target->tr, cdata->do_manage);
|
|
}
|
|
else {
|
|
/* 0 means don't care, so just use first */
|
|
if (cdata->which_output == node->custom1 || (cdata->which_output == 0 && node->custom1 == 1)) {
|
|
TexParams params;
|
|
params_from_cdata(¶ms, cdata);
|
|
|
|
tex_input_rgba(&target->tr, in[0], ¶ms, cdata->thread);
|
|
|
|
target->tin = (target->tr + target->tg + target->tb) / 3.0f;
|
|
target->talpha = true;
|
|
|
|
if (target->nor) {
|
|
if (in[1] && in[1]->hasinput) {
|
|
tex_input_vec(target->nor, in[1], ¶ms, cdata->thread);
|
|
}
|
|
else {
|
|
target->nor = NULL;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
static void unique_name(bNode *node)
|
|
{
|
|
TexNodeOutput *tno = (TexNodeOutput *)node->storage;
|
|
char new_name[sizeof(tno->name)];
|
|
int new_len = 0;
|
|
int suffix;
|
|
bNode *i;
|
|
const char *name = tno->name;
|
|
|
|
new_name[0] = '\0';
|
|
i = node;
|
|
while (i->prev) {
|
|
i = i->prev;
|
|
}
|
|
for (; i; i = i->next) {
|
|
if (i == node || i->type != TEX_NODE_OUTPUT ||
|
|
!STREQ(name, ((TexNodeOutput *)(i->storage))->name)) {
|
|
continue;
|
|
}
|
|
|
|
if (new_name[0] == '\0') {
|
|
int len = strlen(name);
|
|
if (len >= 4 && sscanf(name + len - 4, ".%03d", &suffix) == 1) {
|
|
new_len = len;
|
|
}
|
|
else {
|
|
suffix = 0;
|
|
new_len = len + 4;
|
|
if (new_len > (sizeof(tno->name) - 1)) {
|
|
new_len = (sizeof(tno->name) - 1);
|
|
}
|
|
}
|
|
|
|
BLI_strncpy(new_name, name, sizeof(tno->name));
|
|
name = new_name;
|
|
}
|
|
sprintf(new_name + new_len - 4, ".%03d", ++suffix);
|
|
}
|
|
|
|
if (new_name[0] != '\0') {
|
|
BLI_strncpy(tno->name, new_name, sizeof(tno->name));
|
|
}
|
|
}
|
|
|
|
static void assign_index(struct bNode *node)
|
|
{
|
|
bNode *tnode;
|
|
int index = 1;
|
|
|
|
tnode = node;
|
|
while (tnode->prev) {
|
|
tnode = tnode->prev;
|
|
}
|
|
|
|
check_index:
|
|
for (; tnode; tnode = tnode->next) {
|
|
if (tnode->type == TEX_NODE_OUTPUT && tnode != node) {
|
|
if (tnode->custom1 == index) {
|
|
index++;
|
|
goto check_index;
|
|
}
|
|
}
|
|
}
|
|
|
|
node->custom1 = index;
|
|
}
|
|
|
|
static void init(bNodeTree *UNUSED(ntree), bNode *node)
|
|
{
|
|
TexNodeOutput *tno = MEM_callocN(sizeof(TexNodeOutput), "TEX_output");
|
|
node->storage = tno;
|
|
|
|
strcpy(tno->name, "Default");
|
|
unique_name(node);
|
|
assign_index(node);
|
|
}
|
|
|
|
static void copy(bNodeTree *dest_ntree, bNode *dest_node, const bNode *src_node)
|
|
{
|
|
node_copy_standard_storage(dest_ntree, dest_node, src_node);
|
|
unique_name(dest_node);
|
|
assign_index(dest_node);
|
|
}
|
|
|
|
void register_node_type_tex_output(void)
|
|
{
|
|
static bNodeType ntype;
|
|
|
|
tex_node_type_base(&ntype, TEX_NODE_OUTPUT, "Output", NODE_CLASS_OUTPUT, NODE_PREVIEW);
|
|
node_type_socket_templates(&ntype, inputs, NULL);
|
|
node_type_size_preset(&ntype, NODE_SIZE_MIDDLE);
|
|
node_type_init(&ntype, init);
|
|
node_type_storage(&ntype, "TexNodeOutput", node_free_standard_storage, copy);
|
|
node_type_exec(&ntype, NULL, NULL, exec);
|
|
|
|
/* Do not allow muting output. */
|
|
node_type_internal_links(&ntype, NULL);
|
|
|
|
nodeRegisterType(&ntype);
|
|
}
|