Merge branch 'master' into blender2.8
Conflicts: source/blender/blenkernel/intern/depsgraph.c source/blender/blenloader/intern/versioning_270.c source/blender/depsgraph/intern/builder/deg_builder_relations.cc source/blender/makesrna/intern/rna_main_api.c source/blender/makesrna/intern/rna_particle.c
This commit is contained in:
@@ -84,6 +84,10 @@ class QuickSmoke(Operator):
|
||||
)
|
||||
|
||||
def execute(self, context):
|
||||
if not bpy.app.build_options.mod_smoke:
|
||||
self.report({'ERROR'}, "Build without Smoke modifier support")
|
||||
return {'CANCELLED'}
|
||||
|
||||
fake_context = context.copy()
|
||||
mesh_objects = [obj for obj in context.selected_objects
|
||||
if obj.type == 'MESH']
|
||||
@@ -329,6 +333,10 @@ class QuickFluid(Operator):
|
||||
)
|
||||
|
||||
def execute(self, context):
|
||||
if not bpy.app.build_options.mod_fluid:
|
||||
self.report({'ERROR'}, "Build without Fluid modifier support")
|
||||
return {'CANCELLED'}
|
||||
|
||||
fake_context = context.copy()
|
||||
mesh_objects = [obj for obj in context.selected_objects
|
||||
if (obj.type == 'MESH' and 0.0 not in obj.dimensions)]
|
||||
|
||||
@@ -146,6 +146,10 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
|
||||
layout.row().prop(md, "offset_type", expand=True)
|
||||
|
||||
def BOOLEAN(self, layout, ob, md):
|
||||
if not bpy.app.build_options.mod_boolean:
|
||||
layout.label("Built without Boolean modifier")
|
||||
return
|
||||
|
||||
split = layout.split()
|
||||
|
||||
col = split.column()
|
||||
@@ -1043,6 +1047,10 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
|
||||
col.prop(md, "narrowness", slider=True)
|
||||
|
||||
def REMESH(self, layout, ob, md):
|
||||
if not bpy.app.build_options.mod_remesh:
|
||||
layout.label("Built without Remesh modifier")
|
||||
return
|
||||
|
||||
layout.prop(md, "mode")
|
||||
|
||||
row = layout.row()
|
||||
|
||||
@@ -44,6 +44,10 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel, Panel):
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
|
||||
if not bpy.app.build_options.mod_smoke:
|
||||
layout.label("Built without Smoke modifier")
|
||||
return
|
||||
|
||||
md = context.smoke
|
||||
ob = context.object
|
||||
|
||||
|
||||
@@ -2941,11 +2941,18 @@ class VIEW3D_MT_edit_gpencil(Menu):
|
||||
layout.separator()
|
||||
|
||||
layout.menu("VIEW3D_MT_object_animation") # NOTE: provides keyingset access...
|
||||
layout.menu("VIEW3D_MT_edit_gpencil_interpolate")
|
||||
|
||||
layout.separator()
|
||||
|
||||
layout.menu("VIEW3D_MT_edit_gpencil_delete")
|
||||
layout.operator("gpencil.duplicate_move", text="Duplicate")
|
||||
layout.operator("gpencil.stroke_subdivide", text="Subdivide")
|
||||
|
||||
layout.separator()
|
||||
|
||||
layout.operator_menu_enum("gpencil.stroke_join", "type", text="Join...")
|
||||
layout.operator("gpencil.stroke_flip", text="Flip Direction")
|
||||
|
||||
layout.separator()
|
||||
|
||||
@@ -2965,6 +2972,11 @@ class VIEW3D_MT_edit_gpencil(Menu):
|
||||
layout.separator()
|
||||
|
||||
layout.operator_menu_enum("gpencil.move_to_layer", "layer", text="Move to Layer")
|
||||
layout.operator("gpencil.stroke_change_color", text="Move to Color")
|
||||
layout.operator_menu_enum("gpencil.stroke_arrange", "direction", text="Arrange Strokes...")
|
||||
|
||||
layout.separator()
|
||||
|
||||
layout.operator_menu_enum("gpencil.convert", "type", text="Convert to Geometry...")
|
||||
|
||||
|
||||
@@ -2985,6 +2997,20 @@ class VIEW3D_MT_edit_gpencil_transform(Menu):
|
||||
layout.operator("transform.tosphere", text="To Sphere")
|
||||
layout.operator("transform.transform", text="Shrink Fatten").mode = 'GPENCIL_SHRINKFATTEN'
|
||||
|
||||
layout.separator()
|
||||
|
||||
layout.operator("gpencil.reproject")
|
||||
|
||||
|
||||
class VIEW3D_MT_edit_gpencil_interpolate(Menu):
|
||||
bl_label = "Interpolate"
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
|
||||
layout.operator("gpencil.interpolate", text="Interpolate")
|
||||
layout.operator("gpencil.interpolate_sequence", text="Sequence")
|
||||
|
||||
|
||||
# ********** Panel **********
|
||||
|
||||
|
||||
Reference in New Issue
Block a user