diff options
author | Thomas Dinges <blender@dingto.org> | 2013-07-30 13:26:45 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2013-07-30 13:26:45 +0400 |
commit | 5ce3588c6c4c0f34911ffb829ec6e4aa31b00dda (patch) | |
tree | 95dcd7b6c4f33f41f7743d844a4cda58064cf069 /intern/cycles | |
parent | 6c5a4aedc22cf997e8dff3e7865e387dfaae76c0 (diff) |
Cycles:
* Increase the maximum amount of closures per shader from 16 to 64, so more complex closure trees can be rendered.
I measured performance on CPU and GPU (Geforce 540M) and couldn't find a performance impact, but if someone encounters a noticeable impact on his system, please report.
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/bvh/bvh.h | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_types.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/bvh/bvh.h b/intern/cycles/bvh/bvh.h index 00c146143b8..f2c96638b84 100644 --- a/intern/cycles/bvh/bvh.h +++ b/intern/cycles/bvh/bvh.h @@ -46,7 +46,7 @@ class Progress; struct PackedBVH { /* BVH nodes storage, one node is 4x int4, and contains two bounding boxes, - * and child, triangle or object indexes dependening on the node type */ + * and child, triangle or object indexes depending on the node type */ array<int4> nodes; /* object index to BVH node index mapping for instances */ array<int> object_node; diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 3bd0d5c3561..38ababa96bd 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -436,7 +436,7 @@ typedef enum AttributeStandard { /* Closure data */ -#define MAX_CLOSURE 16 +#define MAX_CLOSURE 64 typedef struct ShaderClosure { ClosureType type; |