diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-08 23:58:17 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-09 22:28:00 +0300 |
commit | 21a535840df1887245b90376a0de427f2a848806 (patch) | |
tree | be7619efd57294371387ec64e99e81b4988b7a85 /intern/cycles/kernel/closure | |
parent | 1ffa01b6f874403cb1b30f9f1ecd52088501f436 (diff) |
Fix T53270: crash with multiscatter GGX after recent refactoring.
In fact this was an existing issue when exceeding the number of available
closure, but it's more common now that we set the number to 0 for shadows
and emission
Diffstat (limited to 'intern/cycles/kernel/closure')
-rw-r--r-- | intern/cycles/kernel/closure/alloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/closure/alloc.h b/intern/cycles/kernel/closure/alloc.h index 48a60405b5a..b903aeb8073 100644 --- a/intern/cycles/kernel/closure/alloc.h +++ b/intern/cycles/kernel/closure/alloc.h @@ -45,7 +45,7 @@ ccl_device ccl_addr_space void *closure_alloc_extra(ShaderData *sd, int size) int num_extra = ((size + sizeof(ShaderClosure) - 1) / sizeof(ShaderClosure)); if(num_extra > sd->num_closure_left) { - /* Remove previous closure. */ + /* Remove previous closure if it was allocated. */ sd->num_closure--; sd->num_closure_left++; return NULL; |