Mantaflow: remove reminents of high res smoke
authorAaron Carlisle <Blendify>
Thu, 26 Mar 2020 20:28:06 +0000 (16:28 -0400)
committerAaron Carlisle <carlisle.b3d@gmail.com>
Thu, 26 Mar 2020 20:29:08 +0000 (16:29 -0400)
It appears this slipped through the code review

Reviewed By: sebbas

Differential Revision: https://developer.blender.org/D6760

intern/cycles/blender/addon/ui.py
release/datafiles/locale
release/scripts/addons
release/scripts/addons_contrib
release/scripts/startup/bl_ui/properties_render.py
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/tools

index 37675c5699d4b008e7d6fa5d4ab29fe31ac478ba..0ef813d9636d06ebd9e2b3f6b87b66f43faa009a 100644 (file)
@@ -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"
index 34d98762cef85b9c065f21a051d1dbe3bf2979b7..c39d35159117ea69644ee1ebe0004398b0996b22 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 34d98762cef85b9c065f21a051d1dbe3bf2979b7
+Subproject commit c39d35159117ea69644ee1ebe0004398b0996b22
index c6d8243636123f5babc443614cb7ed90ad15b6f7..f05763b347926198316aae24938914c1de7560a7 160000 (submodule)
@@ -1 +1 @@
-Subproject commit c6d8243636123f5babc443614cb7ed90ad15b6f7
+Subproject commit f05763b347926198316aae24938914c1de7560a7
index 70b649775eeeebedb02c1c7b7aa996a7f6294177..9468c406fb554e32ff47b62bfef356b3908ec651 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 70b649775eeeebedb02c1c7b7aa996a7f6294177
+Subproject commit 9468c406fb554e32ff47b62bfef356b3908ec651
index 3d4c70e0143bf9af463e408973f4dad584c229b6..fd4859f3620029984a8d603b08d87a50cf0187af 100644 (file)
@@ -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"
index c1a6265b53bb893548d72051f54ff5ebf0d40b82..7837c1265abe9527de45c071cd2886f015e27e40 100644 (file)
@@ -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;
 
index 480d49273056dedbd290457365fa26b57470d981..289c5eae8690cfc8177a3de1237a78b17fd8f984 100644 (file)
@@ -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);
index 603f076606f052adc97d937633bfeb9b268ec202..4a6f1706258439db3ee5a50ec6938fef79c7cb97 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 603f076606f052adc97d937633bfeb9b268ec202
+Subproject commit 4a6f1706258439db3ee5a50ec6938fef79c7cb97