diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-15 17:17:43 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-15 17:17:43 +0300 |
| commit | ca5fdd857b7864b0336aca655f2c04d00090c0f9 (patch) | |
| tree | 5e19a8ec6a5c08ba9d6e8cf1f98cd7d9980a5f23 /source/blender/nodes/texture/node_texture_tree.c | |
| parent | df1c88b652e6977491b7f2b019c326518ccdc320 (diff) | |
| parent | 2aef87bfae4a6a91f626780767aab68b7791c9d4 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/nodes/texture/node_texture_tree.c')
| -rw-r--r-- | source/blender/nodes/texture/node_texture_tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/nodes/texture/node_texture_tree.c b/source/blender/nodes/texture/node_texture_tree.c index 24e79b71c0a..fab28bacff8 100644 --- a/source/blender/nodes/texture/node_texture_tree.c +++ b/source/blender/nodes/texture/node_texture_tree.c @@ -350,10 +350,10 @@ int ntreeTexExecTree( /* ensure execdata is only initialized once */ if (!exec) { - BLI_lock_thread(LOCK_NODES); + BLI_thread_lock(LOCK_NODES); if (!nodes->execdata) ntreeTexBeginExecTree(nodes); - BLI_unlock_thread(LOCK_NODES); + BLI_thread_unlock(LOCK_NODES); exec = nodes->execdata; } |