[Bf-blender-cvs] [f4b65dd63c4] soc-2018-npr: Merge branch 'blender2.8' into npr_tess

[Sebastian Parborg]

Commit: f4b65dd63c481ef08e490d175aa39efd75101e09
Author: Sebastian Parborg
Date:   Wed Aug 29 12:58:16 2018 +0200
Branches: soc-2018-npr
https://developer.blender.org/rBf4b65dd63c481ef08e490d175aa39efd75101e09

Merge branch 'blender2.8' into npr_tess

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



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

diff --cc release/scripts/startup/bl_ui/properties_data_modifier.py
index bfad245a444,b59447c3f1a..da4d9d2b5b5
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@@ -639,34 -638,9 +638,34 @@@ class DATA_PT_modifiers(ModifierButtons
              row.operator("object.multires_external_save", text="Save External...")
              row.label()
  
 +    def MY_BMESH(self, layout, ob, md):
 +        split = layout.split(percentage=0.25)
 +
 +        col = split.column()
 +        col.label(text="§6.1:")
 +        col.prop(md, "do_tri")
 +        col.prop(md, "do_ff_bb_split")
 +
 +        col = split.column()
 +        col.label(text="§6.2:")
 +        col.prop(md, "do_cusp_dect")
 +        col.prop(md, "do_insert")
 +        col.prop(md, "do_cusp_insert")
 +
 +        col = split.column()
 +        col.label(text="§6.3:")
 +        col.prop(md, "do_rad_insert")
 +        col.prop(md, "do_rad_flip")
 +        col.prop(md, "do_opti")
 +
 +
 +        col = layout.column()
 +        col.label(text="Camera Object:")
 +        col.prop(md, "camera_object", text="")
 +
      def OCEAN(self, layout, ob, md):
          if not bpy.app.build_options.mod_oceansim:
-             layout.label("Built without OceanSim modifier")
+             layout.label(text="Built without OceanSim modifier")
              return
  
          layout.prop(md, "geometry_mode")