diff options
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 2 | ||||
| m--------- | release/datafiles/locale | 0 | ||||
| m--------- | release/scripts/addons | 0 | ||||
| m--------- | release/scripts/addons_contrib | 0 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 3 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 3 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 6 | ||||
| m--------- | source/tools | 0 |
8 files changed, 2 insertions, 12 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 37675c5699d..0ef813d9636 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -2086,7 +2086,7 @@ class CYCLES_RENDER_PT_simplify_viewport(CyclesButtonsPanel, Panel): col.prop(rd, "simplify_child_particles", text="Child Particles") col.prop(cscene, "texture_limit", text="Texture Limit") col.prop(cscene, "ao_bounces", text="AO Bounces") - col.prop(rd, "use_simplify_smoke_highres") + class CYCLES_RENDER_PT_simplify_render(CyclesButtonsPanel, Panel): bl_label = "Render" diff --git a/release/datafiles/locale b/release/datafiles/locale -Subproject 34d98762cef85b9c065f21a051d1dbe3bf2979b +Subproject c39d35159117ea69644ee1ebe0004398b0996b2 diff --git a/release/scripts/addons b/release/scripts/addons -Subproject c6d8243636123f5babc443614cb7ed90ad15b6f +Subproject f05763b347926198316aae24938914c1de7560a diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib -Subproject 70b649775eeeebedb02c1c7b7aa996a7f629417 +Subproject 9468c406fb554e32ff47b62bfef356b3908ec65 diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 3d4c70e0143..fd4859f3620 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -648,9 +648,6 @@ class RENDER_PT_simplify_viewport(RenderButtonsPanel, Panel): col = flow.column() col.prop(rd, "simplify_child_particles", text="Max Child Particles") - col = flow.column() - col.prop(rd, "use_simplify_smoke_highres", text="High-resolution Smoke") - class RENDER_PT_simplify_render(RenderButtonsPanel, Panel): bl_label = "Render" diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index c1a6265b53b..7837c1265ab 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -731,13 +731,12 @@ typedef struct RenderData { char seq_rend_type; /** Flag use for sequence render/draw. */ char seq_flag; - char _pad5[5]; + char _pad5[7]; /* render simplify */ short simplify_subsurf; short simplify_subsurf_render; short simplify_gpencil; - short simplify_smoke_ignore_highres; float simplify_particles; float simplify_particles_render; diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 480d4927305..289c5eae869 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -6380,12 +6380,6 @@ static void rna_def_scene_render_data(BlenderRNA *brna) prop, "Simplify Child Particles", "Global child particles percentage during rendering"); RNA_def_property_update(prop, 0, "rna_Scene_simplify_update"); - prop = RNA_def_property(srna, "use_simplify_smoke_highres", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_negative_sdna(prop, NULL, "simplify_smoke_ignore_highres", 1); - RNA_def_property_ui_text( - prop, "Use High-resolution Smoke", "Display high-resolution smoke in the viewport"); - RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL); - /* Grease Pencil - Simplify Options */ prop = RNA_def_property(srna, "simplify_gpencil", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "simplify_gpencil", SIMPLIFY_GPENCIL_ENABLE); diff --git a/source/tools b/source/tools -Subproject 603f076606f052adc97d937633bfeb9b268ec20 +Subproject 4a6f1706258439db3ee5a50ec6938fef79c7cb9 |