[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55528] trunk/blender: Code cleanup:

[Thomas Dinges]

Revision: 55528
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55528
Author:   dingto
Date:     2013-03-23 06:55:59 +0000 (Sat, 23 Mar 2013)
Log Message:
-----------
Code cleanup:
* Use bpy.app.build_options for UI checks rather than custom ones. 

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
    trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
    trunk/blender/release/scripts/startup/bl_ui/space_info.py
    trunk/blender/source/blender/makesrna/intern/rna_modifier.c

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py	2013-03-23 03:11:48 UTC (rev 55527)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py	2013-03-23 06:55:59 UTC (rev 55528)
@@ -509,7 +509,7 @@
             row.label()
 
     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")
             return
 

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py	2013-03-23 03:11:48 UTC (rev 55527)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py	2013-03-23 06:55:59 UTC (rev 55528)
@@ -51,7 +51,7 @@
         fluid = md.settings
 
         col = layout.column()
-        if fluid is None:
+        if not bpy.app.build_options.mod_fluid:
             col.label("Built without fluids")
             return
 

Modified: trunk/blender/release/scripts/startup/bl_ui/space_info.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_info.py	2013-03-23 03:11:48 UTC (rev 55527)
+++ trunk/blender/release/scripts/startup/bl_ui/space_info.py	2013-03-23 06:55:59 UTC (rev 55528)
@@ -157,7 +157,7 @@
     bl_label = "Import"
 
     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)")
 
 
@@ -166,7 +166,7 @@
     bl_label = "Export"
 
     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)")
 
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2013-03-23 03:11:48 UTC (rev 55527)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2013-03-23 06:55:59 UTC (rev 55528)
@@ -670,15 +670,6 @@
 		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)
 {
 	OceanModifierData *omd = (OceanModifierData *)ptr->data;
@@ -3287,12 +3278,6 @@
 	RNA_def_struct_sdna(srna, "OceanModifierData");
 	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);
 	RNA_def_property_enum_sdna(prop, NULL, "geometry_mode");
 	RNA_def_property_enum_items(prop, geometry_items);