[Bf-blender-cvs] [f0e7dba4ff8] modifier-panels-ui: Fix more build errors, remove old property from UI

[Hans Goudey]

Commit: f0e7dba4ff82142b83e3f1fd542da5fb566a3e6d
Author: Hans Goudey
Date:   Sat Mar 28 00:35:49 2020 -0500
Branches: modifier-panels-ui
https://developer.blender.org/rBf0e7dba4ff82142b83e3f1fd542da5fb566a3e6d

Fix more build errors, remove old property from UI

Test before pushing...

===================================================================

M	release/scripts/startup/bl_ui/properties_data_modifier.py
M	source/blender/modifiers/intern/MOD_lattice.c
M	source/blender/modifiers/intern/MOD_meshsequencecache.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index cccbcb07603..d4415c093a8 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -65,7 +65,6 @@ class DATA_UL_modifiers(UIList):
 
         if self.layout_type in {'DEFAULT', 'COMPACT'}:
             layout.prop(md, 'name', text="", emboss=False, icon_value=1, icon=icon)
-            layout.prop(md, 'show_ui', text="", emboss=False, icon_only=True, icon='HIDE_OFF')
             layout.prop(md, 'show_viewport', text="", emboss=False, icon_only=True)
             layout.prop(md, 'show_render', text="", emboss=False, icon_only=True)
         elif self.layout_type == 'GRID':
diff --git a/source/blender/modifiers/intern/MOD_lattice.c b/source/blender/modifiers/intern/MOD_lattice.c
index e0d6b6da713..2a6d0ddc1d7 100644
--- a/source/blender/modifiers/intern/MOD_lattice.c
+++ b/source/blender/modifiers/intern/MOD_lattice.c
@@ -140,25 +140,25 @@ static void deformVertsEM(ModifierData *md,
   }
 }
 
-uiLayout *sub, *row, *split, *col;
+// uiLayout *sub, *row, *split, *col;
 
-bool has_vertex_group = RNA_string_length(ptr, "vertex_group") != 0;
+// bool has_vertex_group = RNA_string_length(ptr, "vertex_group") != 0;
 
-split = uiLayoutSplit(layout, 0.5f, false);
-col = uiLayoutColumn(split, false);
-uiItemL(col, IFACE_("Object:"), ICON_NONE);
-uiItemR(col, ptr, "object", 0, "", ICON_NONE);
+// split = uiLayoutSplit(layout, 0.5f, false);
+// col = uiLayoutColumn(split, false);
+// uiItemL(col, IFACE_("Object:"), ICON_NONE);
+// uiItemR(col, ptr, "object", 0, "", ICON_NONE);
 
-col = uiLayoutColumn(split, false);
-uiItemL(col, IFACE_("Vertex Group:"), ICON_NONE);
-row = uiLayoutRow(col, true);
-uiItemPointerR(row, ptr, "vertex_group", ob_ptr, "vertex_groups", "", ICON_NONE);
-sub = uiLayoutRow(row, true);
-uiLayoutSetActive(sub, has_vertex_group);
-uiItemR(sub, ptr, "invert_vertex_group", 0, "", ICON_ARROW_LEFTRIGHT);
+// col = uiLayoutColumn(split, false);
+// uiItemL(col, IFACE_("Vertex Group:"), ICON_NONE);
+// row = uiLayoutRow(col, true);
+// uiItemPointerR(row, ptr, "vertex_group", ob_ptr, "vertex_groups", "", ICON_NONE);
+// sub = uiLayoutRow(row, true);
+// uiLayoutSetActive(sub, has_vertex_group);
+// uiItemR(sub, ptr, "invert_vertex_group", 0, "", ICON_ARROW_LEFTRIGHT);
 
-uiItemS(layout);
-uiItemR(layout, ptr, "strength", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
+// uiItemS(layout);
+// uiItemR(layout, ptr, "strength", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 
 ModifierTypeInfo modifierType_Lattice = {
     /* name */ "Lattice",
diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.c b/source/blender/modifiers/intern/MOD_meshsequencecache.c
index 471a97eba66..10f928e4b75 100644
--- a/source/blender/modifiers/intern/MOD_meshsequencecache.c
+++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c
@@ -192,26 +192,26 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
   }
 }
 
-uiLayout *box, *row;
+// uiLayout *box, *row;
 
-PointerRNA cache_file_ptr = RNA_pointer_get(ptr, "cache_file");
-bool has_cache_file = !RNA_pointer_is_null(&cache_file_ptr);
+// PointerRNA cache_file_ptr = RNA_pointer_get(ptr, "cache_file");
+// bool has_cache_file = !RNA_pointer_is_null(&cache_file_ptr);
 
-uiItemL(layout, IFACE_("Cache File Properties:"), ICON_NONE);
-box = uiLayoutBox(layout);
-uiTemplateCacheFile(box, C, ptr, "cache_file");
+// uiItemL(layout, IFACE_("Cache File Properties:"), ICON_NONE);
+// box = uiLayoutBox(layout);
+// uiTemplateCacheFile(box, C, ptr, "cache_file");
 
-uiItemL(layout, IFACE_("Modifier Properties:"), ICON_NONE);
-box = uiLayoutBox(layout);
+// uiItemL(layout, IFACE_("Modifier Properties:"), ICON_NONE);
+// box = uiLayoutBox(layout);
 
-if (has_cache_file) {
-  uiItemPointerR(box, ptr, "object_path", &cache_file_ptr, "object_paths", NULL, ICON_NONE);
-}
+// if (has_cache_file) {
+//   uiItemPointerR(box, ptr, "object_path", &cache_file_ptr, "object_paths", NULL, ICON_NONE);
+// }
 
-if (RNA_enum_get(ob_ptr, "type") == OB_MESH) {
-  row = uiLayoutRow(box, false);
-  uiItemR(row, ptr, "read_data", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
-}
+// if (RNA_enum_get(ob_ptr, "type") == OB_MESH) {
+//   row = uiLayoutRow(box, false);
+//   uiItemR(row, ptr, "read_data", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
+// }
 
 ModifierTypeInfo modifierType_MeshSequenceCache = {
     /* name */ "Mesh Sequence Cache",