diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-06-26 15:47:53 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-06-26 15:47:53 +0300 |
| commit | 8690ea611e804e2adfc8a346420787818c85950f (patch) | |
| tree | 7430bf189e114e541d38cd0aa11bcb77cf2cb6d8 /source/blender/makesdna | |
| parent | 09e89f01a6ee5314833cf8838ea124e0cf75c60e (diff) | |
Fix T45199 crash when editing material nodes.
Issue is data race between preview job and GPU nodetree evaluation when
localizing the nodetree. Data race happens due to localizations doing
overrides on original nodes' new_node variable.
Solution here could probably be to use a hash for mapping of old to new
nodes but will prefer simple brute force lock for now.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index ead822053b3..bce13921903 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -386,6 +386,8 @@ typedef struct bNodeTree { int (*test_break)(void *); void (*update_draw)(void *); void *tbh, *prh, *sdh, *udh; + + void *duplilock; } bNodeTree; |