diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-08-17 12:30:00 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2020-08-17 12:30:00 +0300 |
| commit | 3f0e2dba681f04bb70e06328d5c6439ce1290896 (patch) | |
| tree | 0e91d14932d917a0afd3ee12331a9a4b1e4eb5ae /source/blender/makesrna | |
| parent | 8b4f318f92509a9d4b6a20a3b47ae06045c8d007 (diff) | |
| parent | 68651534c26346015a70775aef1fdadab2946fb6 (diff) | |
Merge branch 'master' into greasepencil-edit-curve
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 9f259aba0c7..317aa6bad5d 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -1297,15 +1297,13 @@ static const EnumPropertyItem *rna_3DViewShading_render_pass_itemf(bContext *C, { Scene *scene = CTX_data_scene(C); - const bool ao_enabled = scene->eevee.flag & SCE_EEVEE_GTAO_ENABLED; const bool bloom_enabled = scene->eevee.flag & SCE_EEVEE_BLOOM_ENABLED; int totitem = 0; EnumPropertyItem *result = NULL; for (int i = 0; rna_enum_view3dshading_render_pass_type_items[i].identifier != NULL; i++) { const EnumPropertyItem *item = &rna_enum_view3dshading_render_pass_type_items[i]; - if (!((!ao_enabled && item->value == EEVEE_RENDER_PASS_AO) || - (!bloom_enabled && + if (!((!bloom_enabled && (item->value == EEVEE_RENDER_PASS_BLOOM || STREQ(item->name, "Effects"))))) { RNA_enum_item_add(&result, &totitem, item); } @@ -1321,9 +1319,6 @@ static int rna_3DViewShading_render_pass_get(PointerRNA *ptr) eViewLayerEEVEEPassType result = shading->render_pass; Scene *scene = rna_3DViewShading_scene(ptr); - if (result == EEVEE_RENDER_PASS_AO && ((scene->eevee.flag & SCE_EEVEE_GTAO_ENABLED) == 0)) { - result = EEVEE_RENDER_PASS_COMBINED; - } if (result == EEVEE_RENDER_PASS_BLOOM && ((scene->eevee.flag & SCE_EEVEE_BLOOM_ENABLED) == 0)) { result = EEVEE_RENDER_PASS_COMBINED; } @@ -4796,7 +4791,7 @@ static void rna_def_space_sequencer(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Waveform Displaying", "How Waveforms are drawn"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, NULL); - prop = RNA_def_property(srna, "zoom_to_fit", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_zoom_to_fit", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_ZOOM_TO_FIT); RNA_def_property_ui_text( prop, "Zoom to Fit", "Automatically zoom preview image to make it fully fit the region"); |