Commit: db66c3a9a2feb49b1fee35d3984099dab966057b
Author: Nick Wu
Date: Tue Aug 28 12:46:50 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rBdb66c3a9a2feb49b1fee35d3984099dab966057b
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr
# Conflicts:
# release/scripts/addons
# release/scripts/addons_contrib
# source/tools
===================================================================
===================================================================
diff --cc release/scripts/startup/bl_ui/properties_data_modifier.py
index f7d067ba2da,82616fdca82..68e7f16b915
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@@ -639,34 -639,9 +639,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")
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
