[Bf-blender-cvs] [63bf87364c0] temp-fracture-modifier-2.8: Merge remote-tracking branch 'origin/blender2.8' into fracture_modifier-2.8

Martin Felke noreply at git.blender.org
Fri Aug 31 23:09:24 CEST 2018


Commit: 63bf87364c0402e19e10004bdbf7756cbd8e84a2
Author: Martin Felke
Date:   Fri Aug 31 23:08:00 2018 +0200
Branches: temp-fracture-modifier-2.8
https://developer.blender.org/rB63bf87364c0402e19e10004bdbf7756cbd8e84a2

Merge remote-tracking branch 'origin/blender2.8' into fracture_modifier-2.8

# Conflicts:
#	release/scripts/addons

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



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

diff --cc build_files/cmake/Modules/FindPythonLibsUnix.cmake
index 140f8be048a,140f8be048a..a6924972e42
--- a/build_files/cmake/Modules/FindPythonLibsUnix.cmake
+++ b/build_files/cmake/Modules/FindPythonLibsUnix.cmake
@@@ -38,7 -38,7 +38,7 @@@ IF(NOT PYTHON_ROOT_DIR AND NOT $ENV{PYT
    SET(PYTHON_ROOT_DIR $ENV{PYTHON_ROOT_DIR})
  ENDIF()
  
--SET(PYTHON_VERSION 3.6 CACHE STRING "Python Version (major and minor only)")
++SET(PYTHON_VERSION 3.7 CACHE STRING "Python Version (major and minor only)")
  MARK_AS_ADVANCED(PYTHON_VERSION)
  
  
diff --cc release/scripts/addons
index 5e741506342,371960484a3..b5a35bbd39a
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 5e7415063426f8c03ef53edc2b412f6572798765
 -Subproject commit 371960484a38fc64e0a2635170a41a0d8ab2f6bd
++Subproject commit b5a35bbd39af54dee33fc5ea039e49e6e9f450a8
diff --cc release/scripts/startup/bl_ui/properties_physics_fracture.py
index 686d1cd55a4,00000000000..122450e3da3
mode 100644,000000..100644
--- a/release/scripts/startup/bl_ui/properties_physics_fracture.py
+++ b/release/scripts/startup/bl_ui/properties_physics_fracture.py
@@@ -1,345 -1,0 +1,345 @@@
 +# ##### BEGIN GPL LICENSE BLOCK #####
 +#
 +#  This program is free software; you can redistribute it and/or
 +#  modify it under the terms of the GNU General Public License
 +#  as published by the Free Software Foundation; either version 2
 +#  of the License, or (at your option) any later version.
 +#
 +#  This program is distributed in the hope that it will be useful,
 +#  but WITHOUT ANY WARRANTY; without even the implied warranty of
 +#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +#  GNU General Public License for more details.
 +#
 +#  You should have received a copy of the GNU General Public License
 +#  along with this program; if not, write to the Free Software Foundation,
 +#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 +#
 +# ##### END GPL LICENSE BLOCK #####
 +
 +# <pep8 compliant>
 +import bpy
 +from bpy.types import Panel, Menu, UIList
 +from bpy.app.translations import pgettext_iface as iface_
 +
 +
 +class FRACTURE_MT_presets(Menu):
 +    bl_label = "Fracture Presets"
 +    preset_subdir = "fracture"
 +    preset_operator = "script.execute_preset"
 +    draw = Menu.draw_preset
 +
 +
 +class PhysicButtonsPanel():
 +    bl_space_type = 'PROPERTIES'
 +    bl_region_type = 'WINDOW'
 +    bl_context = "physics"
 +
 +    @classmethod
 +    def poll(cls, context):
 +        ob = context.object
 +        return ob and (ob.type == 'MESH') and context.fracture
 +
 +class PHYSICS_PT_fracture_anim_mesh(PhysicButtonsPanel, Panel):
 +    bl_label = "Animated Mesh"
 +    bl_options = {'DEFAULT_CLOSED'}
 +    bl_parent_id = 'PHYSICS_PT_fracture'
 +
 +    def draw_header(self, context):
 +        md = context.fracture
 +        self.layout.prop(md, "use_animated_mesh", text="")
 +
 +    def draw(self, context):
 +        layout = self.layout
 +        md = context.fracture
 +        layout.context_pointer_set("modifier", md)
 +        layout.active = md.use_animated_mesh
 +        row = layout.row()
 +        row.prop(md, "animated_mesh_limit")
 +        row.prop(md, "use_animated_mesh_rotation")
 +        row = layout.row()
 +        row.prop(md, "animated_mesh_input")
 +        row = layout.row()
 +        row.operator("object.fracture_anim_bind", text="Bind", icon="UV_VERTEXSEL")
 +
 +class PHYSICS_PT_fracture_advanced(PhysicButtonsPanel, Panel):
 +    bl_label = "Advanced"
 +    bl_options = {'DEFAULT_CLOSED'}
 +    bl_parent_id = 'PHYSICS_PT_fracture'
 +
 +    def draw(self, context):
 +        layout = self.layout
 +        md = context.fracture
 +        ob = context.object
 +
-         layout.label("Fracture Point Source:")
++        layout.label(text="Fracture Point Source")
 +        col = layout.column()
 +        col.context_pointer_set("modifier", md)
 +        col.prop(md, "point_source")
 +        if 'GRID' in md.point_source:
 +            sub = col.split(0.33)
 +            sub.prop(md, "grid_resolution")
 +            sub.prop(md, "grid_offset")
 +            sub.prop(md, "grid_spacing")
 +        #if 'GREASE_PENCIL' in md.point_source:
 +        #    col.prop(md, "use_greasepencil_edges")
 +        #    col.prop(md, "grease_offset")
 +        #    col.prop(md, "grease_decimate")
 +        #    col.prop(md, "cutter_axis")
 +        if 'EXTRA_PARTICLES' in md.point_source or 'EXTRA_VERTS' in md.point_source:
 +            col.prop(md, "extra_group", text="Helpers")
 +        if 'CUSTOM' in md.point_source:
 +            col.prop(md, "cutter_group")
 +            if (md.cutter_group):
 +                col.prop(md, "keep_cutter_shards")
-                 col.label("Material Index Offset")
++                col.label(text="Material Index Offset")
 +                row = col.row(align=True)
 +                row.prop(md, "material_offset_intersect", text="Intersect")
 +                row.prop(md, "material_offset_difference", text="Difference")
 +        row = col.row()
 +        row.prop(md, "dm_group", text="Pack Group")
 +        row.prop(md, "use_constraint_group", text="Constraints Only")
 +        col.operator("object.fracture_pack", text="Pack", icon="PACKAGE")
 +        col.prop(md, "use_particle_birth_coordinates")
 +        col.prop(md, "percentage")
 +        sub = col.column(align=True)
 +        sub.prop_search(md, "thresh_vertex_group", ob, "vertex_groups", text = "Threshold")
 +        sub.prop_search(md, "passive_vertex_group", ob, "vertex_groups", text = "Passive")
 +        sub.prop_search(md, "inner_vertex_group", ob, "vertex_groups", text = "Inner")
 +        sub.prop(md, "inner_crease")
 +        if (md.frac_algorithm in {'BISECT_FAST', 'BISECT_FAST_FILL', 'BOOLEAN_FRACTAL'}):
 +            col.prop(md, "orthogonality_factor", text="Rectangular Alignment")
 +
 +class PHYSICS_PT_fracture_dynamic(PhysicButtonsPanel, Panel):
 +      bl_label = "Dynamic"
 +      bl_parent_id = 'PHYSICS_PT_fracture'
 +      bl_options = {'DEFAULT_CLOSED'}
 +
 +      def draw_header(self, context):
 +          md = context.fracture
 +          self.layout.prop(md, "use_dynamic", text="")
 +
 +      def draw(self, context):
 +          md = context.fracture
 +          layout = self.layout
 +          layout.active = md.use_dynamic
 +          row = layout.row(align=True)
 +          row.prop(md, "dynamic_force")
 +          row.prop(md, "dynamic_percentage")
 +          col = layout.column(align=True)
 +          col.prop(md, "dynamic_new_constraints")
 +          row = col.row(align=True)
 +          row.prop(md, "limit_impact")
 +          row.prop(md, "dynamic_min_size")
 +
 +class PHYSICS_PT_fracture(PhysicButtonsPanel, Panel):
 +    bl_label = "Fracture"
 +
 +    def draw(self, context):
 +        md = context.fracture
 +        layout = self.layout
-         layout.label(text="Presets:")
++        layout.label(text="Presets")
 +        sub = layout.row(align=True)
 +        sub.menu("FRACTURE_MT_presets", text=bpy.types.FRACTURE_MT_presets.bl_label)
 +        sub.operator("fracture.preset_add", text="", icon='ZOOMIN')
 +        sub.operator("fracture.preset_add", text="", icon='ZOOMOUT').remove_active = True
 +
 +        layout.context_pointer_set("modifier", md)
 +        row = layout.row()
 +        row.operator("object.fracture_refresh", text="Execute Fracture", icon='MOD_EXPLODE').reset = True
 +
 +class PHYSICS_PT_fracture_basic(PhysicButtonsPanel, Panel):
 +    bl_label = "Basic"
 +    bl_parent_id = 'PHYSICS_PT_fracture'
 +    bl_options = {'DEFAULT_CLOSED'}
 +
 +    def icon(self, bool):
 +        if bool:
 +            return 'TRIA_DOWN'
 +        else:
 +            return 'TRIA_RIGHT'
 +
 +    def draw(self, context):
 +        layout = self.layout
 +
 +        md = context.fracture
 +        ob = context.object
 +
 +        layout.prop(md, "frac_algorithm")
 +        if md.frac_algorithm in {'BOOLEAN', 'BOOLEAN_FRACTAL'}:
 +            col = layout.column(align=True)
 +            col.prop(md, "boolean_double_threshold")
 +        col = layout.column(align=True)
 +        col.prop(md, "shard_count")
 +        col.prop(md, "point_seed")
 +
 +        if md.frac_algorithm in {'BOOLEAN', 'BISECT_FILL', 'BISECT_FAST_FILL', 'BOOLEAN_FRACTAL'}:
 +            col = layout.column()
 +            col.prop(md, "inner_material")
 +            col.prop_search(md, "uv_layer", ob.data, "uv_layers")
 +        if md.frac_algorithm == 'BOOLEAN_FRACTAL':
 +            col = layout.column(align=True)
 +            row = col.row(align=True)
 +            row.prop(md, "fractal_cuts")
 +            row.prop(md, "fractal_iterations")
 +            row = col.row(align=True)
 +            row.prop(md, "fractal_amount")
 +            row.prop(md, "physics_mesh_scale")
 +        row = layout.row(align=True)
 +        row.prop(md, "splinter_axis")
 +        row = layout.row(align=True)
 +        row.prop(md, "splinter_length")
 +        row = layout.row()
 +        row.prop(md, "split_islands")
 +        row.prop(md, "use_smooth")
 +        row = layout.row()
 +        row.prop(md, "auto_execute")
 +        row.prop(md, "execute_threaded", text="Threaded (WIP)")
 +
 +class PHYSICS_PT_fracture_simulation(PhysicButtonsPanel, Panel):
 +    bl_label = "Constraints"
 +    bl_options = {'DEFAULT_CLOSED'}
 +    bl_parent_id = 'PHYSICS_PT_fracture'
 +
 +    @classmethod
 +    def poll(cls, context):
 +        md = context.fracture
 +        return PhysicButtonsPanel.poll(context)
 +
 +    def draw_header(self, context):
 +        md = context.fracture
 +        self.layout.prop(md, "use_constraints", text="")
 +
 +    def draw(self, context):
 +        layout = self.layout
 +        md = context.fracture
 +        ob = context.object
 +
 +        layout.active = md.use_constraints
-         layout.label("Constraint Building Settings")
++        layout.label(text="Constraint Building Settings")
 +        row = layout.row()
 +        row.prop(md, "use_breaking")
 +        row.prop(md, "activate_broken")
 +        row = layout.row()
 +        row.prop(md, "use_constraint_collision")
 +        row.prop(md, "use_self_collision")
 +
 +        col = 

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list