diff options
| author | Aaron Carlisle <Blendify> | 2020-03-26 23:28:06 +0300 |
|---|---|---|
| committer | Aaron Carlisle <carlisle.b3d@gmail.com> | 2020-03-26 23:29:08 +0300 |
| commit | a921a4daad437e8ef00adc1f7076449a7cf505e0 (patch) | |
| tree | 84e7c0d0c07deff755d13412d35009d335cb4e9e /source | |
| parent | 56e0249489ce89954a54d5006ddf4147dd02e208 (diff) | |
Mantaflow: remove reminents of high res smoke
It appears this slipped through the code review
Reviewed By: sebbas
Differential Revision: https://developer.blender.org/D6760
Diffstat (limited to 'source')
| -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 |
3 files changed, 1 insertions, 8 deletions
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 |