Commit: b378f32d737bae2b203365b81fcf5da1a80351bb Author: mattoverby Date: Mon Jul 27 13:25:31 2020 -0500 Branches: soc-2020-soft-body https://developer.blender.org/rBb378f32d737bae2b203365b81fcf5da1a80351bb
merged from master =================================================================== =================================================================== diff --cc intern/CMakeLists.txt index 52ece1fea90,0758567bb78..149fd3e4b2c --- a/intern/CMakeLists.txt +++ b/intern/CMakeLists.txt @@@ -30,8 -30,8 +30,13 @@@ add_subdirectory(opensubdiv add_subdirectory(mikktspace) add_subdirectory(glew-mx) add_subdirectory(eigen) + add_subdirectory(sky) + ++ ++ ++ +add_subdirectory(softbody) + if(WITH_AUDASPACE) add_subdirectory(audaspace) endif() diff --cc release/datafiles/locale index 1cc27d5282a,4af22e0492f..4b5779bc192 --- a/release/datafiles/locale +++ b/release/datafiles/locale @@@ -1,1 -1,1 +1,1 @@@ - Subproject commit 1cc27d5282aa4978ee36663aca857eb550df194b -Subproject commit 4af22e0492f401c609a0203cad1a9bc7fa00b863 ++Subproject commit 4b5779bc192b2cc59d77abc188f9e8d7e4a50cd5 diff --cc release/scripts/addons index 5d33d1a1c25,25b00a0a52c..8f6903bc925 --- a/release/scripts/addons +++ b/release/scripts/addons @@@ -1,1 -1,1 +1,1 @@@ - Subproject commit 5d33d1a1c2531e64bda78d46b517571f2b1e98e7 -Subproject commit 25b00a0a52c81408b9dc15ea320a79ee956b3c0a ++Subproject commit 8f6903bc92531aa8e5d4c64a0a108c2904506a83 diff --cc release/scripts/startup/bl_ui/properties_data_mesh.py index ccf66360ad0,77308fed014..57563d674d0 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@@ -483,12 -514,12 +514,15 @@@ class DATA_PT_remesh(MeshButtonsPanel, col.prop(mesh, "use_remesh_preserve_volume", text="Volume") col.prop(mesh, "use_remesh_preserve_paint_mask", text="Paint Mask") col.prop(mesh, "use_remesh_preserve_sculpt_face_sets", text="Face Sets") + if context.preferences.experimental.use_sculpt_vertex_colors: + col.prop(mesh, "use_remesh_preserve_vertex_colors", text="Vertex Colors") + col.operator("object.voxel_remesh", text="Voxel Remesh") - else: + elif mesh.remesh_mode == 'QUAD': col.operator("object.quadriflow_remesh", text="QuadriFlow Remesh") + else: + col.operator("object.tetgen_remesh", text="Tetrahedralize") + class DATA_PT_customdata(MeshButtonsPanel, Panel): _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs