griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #31065: cycles render crash with large node groups, increased the stack

Browse Source 
size now, this seems to work well after some testing.
Fix: material override not working on objects without a material assigned.
This commit is contained in:
Brecht Van Lommel
2012-04-23 18:15:38 +00:00
parent fb6ee37aa2
commit 95432a2a2b
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
intern/cycles/blender/blender_mesh.cpp
View File

@@ -227,6 +227,7 @@ Mesh *BlenderSync::sync_mesh(BL::Object b_ob, bool holdout, bool object_updated)
/* test if we can instance or if the object is modified */
BL::ID b_ob_data = b_ob.data();
BL::ID key = (object_is_modified(b_ob) || holdout)? b_ob: b_ob_data;
BL::Material material_override = render_layer.material_override;
/* find shader indices */
vector<uint> used_shaders;
@@ -246,6 +247,8 @@ Mesh *BlenderSync::sync_mesh(BL::Object b_ob, bool holdout, bool object_updated)
if(used_shaders.size() == 0) {
if(holdout)
used_shaders.push_back(scene->default_holdout);
else if(material_override)
find_shader(material_override, used_shaders, scene->default_surface);
else
used_shaders.push_back(scene->default_surface);
}

2
intern/cycles/kernel/svm/svm_types.h
View File

@@ -24,7 +24,7 @@ CCL_NAMESPACE_BEGIN
/* Stack */
/* SVM stack has a fixed size */
#define SVM_STACK_SIZE 64
#define SVM_STACK_SIZE 255
/* SVM stack offsets with this value indicate that it's not on the stack */
#define SVM_STACK_INVALID 255