blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Fix T51592: Simplify AO Cycles setting remains active while Simplify is disabled

This commit is contained in:
Sergey Sharybin 2017-05-23 10:34:03 +02:00
parent 9b29233800
commit 7add6b89bc
Notes: blender-bot 2023-02-14 06:56:51 +01:00 
Referenced by issue #51592, Simplify AO Cycles setting remains active while Simplify is disabled  - Blender 2.78.5
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -329,6 +329,9 @@ void BlenderSync::sync_integrator()
integrator->ao_bounces = get_int(cscene, "ao_bounces_render");
}
}
else {
integrator->ao_bounces = 0;
}
if(integrator->modified(previntegrator))
integrator->tag_update(scene);

3
source/blender/makesrna/intern/rna_scene.c
View File

@ -1816,7 +1816,7 @@ static void object_simplify_update(Object *ob)
}
}
static void rna_Scene_use_simplify_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)
static void rna_Scene_use_simplify_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
Scene *sce = ptr->id.data;
Scene *sce_iter;
@ -1827,6 +1827,7 @@ static void rna_Scene_use_simplify_update(Main *bmain, Scene *UNUSED(scene), Poi
object_simplify_update(base->object);
WM_main_add_notifier(NC_GEOM | ND_DATA, NULL);
DAG_id_tag_update(&scene->id, 0);
}
static void rna_Scene_simplify_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)