forked from bartvdbraak/blender
Code cleanup:
* Use bpy.app.build_options for UI checks rather than custom ones.
This commit is contained in:
parent
2006103a52
commit
dd713654d5
@ -509,7 +509,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
|
|||||||
row.label()
|
row.label()
|
||||||
|
|
||||||
def OCEAN(self, layout, ob, md):
|
def OCEAN(self, layout, ob, md):
|
||||||
if not md.is_build_enabled:
|
if not bpy.app.build_options.mod_oceansim:
|
||||||
layout.label("Built without OceanSim modifier")
|
layout.label("Built without OceanSim modifier")
|
||||||
return
|
return
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, Panel):
|
|||||||
fluid = md.settings
|
fluid = md.settings
|
||||||
|
|
||||||
col = layout.column()
|
col = layout.column()
|
||||||
if fluid is None:
|
if not bpy.app.build_options.mod_fluid:
|
||||||
col.label("Built without fluids")
|
col.label("Built without fluids")
|
||||||
return
|
return
|
||||||
|
|
||||||
|
@ -157,7 +157,7 @@ class INFO_MT_file_import(Menu):
|
|||||||
bl_label = "Import"
|
bl_label = "Import"
|
||||||
|
|
||||||
def draw(self, context):
|
def draw(self, context):
|
||||||
if hasattr(bpy.types, "WM_OT_collada_import"):
|
if bpy.app.build_options.collada:
|
||||||
self.layout.operator("wm.collada_import", text="Collada (Default) (.dae)")
|
self.layout.operator("wm.collada_import", text="Collada (Default) (.dae)")
|
||||||
|
|
||||||
|
|
||||||
@ -166,7 +166,7 @@ class INFO_MT_file_export(Menu):
|
|||||||
bl_label = "Export"
|
bl_label = "Export"
|
||||||
|
|
||||||
def draw(self, context):
|
def draw(self, context):
|
||||||
if hasattr(bpy.types, "WM_OT_collada_export"):
|
if bpy.app.build_options.collada:
|
||||||
self.layout.operator("wm.collada_export", text="Collada (Default) (.dae)")
|
self.layout.operator("wm.collada_export", text="Collada (Default) (.dae)")
|
||||||
|
|
||||||
|
|
||||||
|
@ -670,15 +670,6 @@ static void rna_UVProjectModifier_num_projectors_set(PointerRNA *ptr, int value)
|
|||||||
md->projectors[a] = NULL;
|
md->projectors[a] = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int rna_OceanModifier_is_build_enabled_get(PointerRNA *UNUSED(ptr))
|
|
||||||
{
|
|
||||||
#ifdef WITH_OCEANSIM
|
|
||||||
return 1;
|
|
||||||
#else /* WITH_OCEANSIM */
|
|
||||||
return 0;
|
|
||||||
#endif /* WITH_OCEANSIM */
|
|
||||||
}
|
|
||||||
|
|
||||||
static void rna_OceanModifier_init_update(Main *bmain, Scene *scene, PointerRNA *ptr)
|
static void rna_OceanModifier_init_update(Main *bmain, Scene *scene, PointerRNA *ptr)
|
||||||
{
|
{
|
||||||
OceanModifierData *omd = (OceanModifierData *)ptr->data;
|
OceanModifierData *omd = (OceanModifierData *)ptr->data;
|
||||||
@ -3287,12 +3278,6 @@ static void rna_def_modifier_ocean(BlenderRNA *brna)
|
|||||||
RNA_def_struct_sdna(srna, "OceanModifierData");
|
RNA_def_struct_sdna(srna, "OceanModifierData");
|
||||||
RNA_def_struct_ui_icon(srna, ICON_MOD_OCEAN);
|
RNA_def_struct_ui_icon(srna, ICON_MOD_OCEAN);
|
||||||
|
|
||||||
/* General check if blender was built with OceanSim modifier support */
|
|
||||||
prop = RNA_def_property(srna, "is_build_enabled", PROP_BOOLEAN, PROP_NONE);
|
|
||||||
RNA_def_property_boolean_funcs(prop, "rna_OceanModifier_is_build_enabled_get", NULL);
|
|
||||||
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
|
|
||||||
RNA_def_property_ui_text(prop, "Build Enabled", "True if the OceanSim modifier is enabled in this build");
|
|
||||||
|
|
||||||
prop = RNA_def_property(srna, "geometry_mode", PROP_ENUM, PROP_NONE);
|
prop = RNA_def_property(srna, "geometry_mode", PROP_ENUM, PROP_NONE);
|
||||||
RNA_def_property_enum_sdna(prop, NULL, "geometry_mode");
|
RNA_def_property_enum_sdna(prop, NULL, "geometry_mode");
|
||||||
RNA_def_property_enum_items(prop, geometry_items);
|
RNA_def_property_enum_items(prop, geometry_items);
|
||||||
|
Loading…
Reference in New Issue
Block a user