Sergey Sharybin
b998a7b384
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
104 lines
3.9 KiB
C++
104 lines
3.9 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) 2007 Blender Foundation.
|
|
* All rights reserved.
|
|
*/
|
|
|
|
/** \file
|
|
* \ingroup nodes
|
|
*/
|
|
|
|
#ifndef __NODE_UTIL_H__
|
|
#define __NODE_UTIL_H__
|
|
|
|
#include "DNA_listBase.h"
|
|
|
|
#include "BLI_utildefines.h"
|
|
|
|
#include "BKE_node.h"
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
#include "NOD_socket.h"
|
|
|
|
#include "GPU_material.h" /* For Shader muting GPU code... */
|
|
|
|
#include "RNA_access.h"
|
|
|
|
struct bNode;
|
|
struct bNodeTree;
|
|
|
|
/* data for initializing node execution */
|
|
typedef struct bNodeExecContext {
|
|
struct bNodeInstanceHash *previews;
|
|
} bNodeExecContext;
|
|
|
|
typedef struct bNodeExecData {
|
|
void *data; /* custom data storage */
|
|
struct bNodePreview *preview; /* optional preview image */
|
|
} bNodeExecData;
|
|
|
|
/**** Storage Data ****/
|
|
|
|
extern void node_free_curves(struct bNode *node);
|
|
extern void node_free_standard_storage(struct bNode *node);
|
|
|
|
extern void node_copy_curves(struct bNodeTree *dest_ntree,
|
|
struct bNode *dest_node,
|
|
const struct bNode *src_node);
|
|
extern void node_copy_standard_storage(struct bNodeTree *dest_ntree,
|
|
struct bNode *dest_node,
|
|
const struct bNode *src_node);
|
|
extern void *node_initexec_curves(struct bNodeExecContext *context,
|
|
struct bNode *node,
|
|
bNodeInstanceKey key);
|
|
|
|
/**** Labels ****/
|
|
|
|
void node_blend_label(struct bNodeTree *ntree, struct bNode *node, char *label, int maxlen);
|
|
void node_image_label(struct bNodeTree *ntree, struct bNode *node, char *label, int maxlen);
|
|
void node_math_label(struct bNodeTree *ntree, struct bNode *node, char *label, int maxlen);
|
|
void node_vect_math_label(struct bNodeTree *ntree, struct bNode *node, char *label, int maxlen);
|
|
void node_filter_label(struct bNodeTree *ntree, struct bNode *node, char *label, int maxlen);
|
|
|
|
/*** Link Handling */
|
|
void node_insert_link_default(struct bNodeTree *ntree, struct bNode *node, struct bNodeLink *link);
|
|
void node_update_internal_links_default(struct bNodeTree *ntree, struct bNode *node);
|
|
|
|
float node_socket_get_float(struct bNodeTree *ntree, struct bNode *node, struct bNodeSocket *sock);
|
|
void node_socket_set_float(struct bNodeTree *ntree,
|
|
struct bNode *node,
|
|
struct bNodeSocket *sock,
|
|
float value);
|
|
void node_socket_get_color(struct bNodeTree *ntree,
|
|
struct bNode *node,
|
|
struct bNodeSocket *sock,
|
|
float *value);
|
|
void node_socket_set_color(struct bNodeTree *ntree,
|
|
struct bNode *node,
|
|
struct bNodeSocket *sock,
|
|
const float *value);
|
|
void node_socket_get_vector(struct bNodeTree *ntree,
|
|
struct bNode *node,
|
|
struct bNodeSocket *sock,
|
|
float *value);
|
|
void node_socket_set_vector(struct bNodeTree *ntree,
|
|
struct bNode *node,
|
|
struct bNodeSocket *sock,
|
|
const float *value);
|
|
|
|
#endif
|