svn merge ^/trunk/blender -r43864:43887

2012-02-05 02:30:30 +00:00
parent 936af71e97 4acab3eb33
commit d0412a1981
42 changed files with 228 additions and 115 deletions
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -824,12 +824,12 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):

    def REMESH(self, layout, ob, md):
        layout.prop(md, "mode")
-        
+
        row = layout.row()
        row.prop(md, "octree_depth")
        row.prop(md, "scale")

-        if md.mode == "SHARP":
+        if md.mode == 'SHARP':
            layout.prop(md, "sharpness")

        layout.prop(md, "remove_disconnected_pieces")