Commit: 8c509bb69cc9d473236e51b1ba51b74176286223 Author: Pablo Dobarro Date: Tue Aug 20 19:13:25 2019 +0200 Branches: sculpt-mode-features https://developer.blender.org/rB8c509bb69cc9d473236e51b1ba51b74176286223
Merge branch 'master' into sculpt-mode-features =================================================================== =================================================================== diff --cc build_files/build_environment/cmake/versions.cmake index 54f903535f3,c3b713096d6..9d2c9a2f172 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@@ -303,23 -303,6 +303,29 @@@ set(EMBREE_VERSION 3.2.4 set(EMBREE_URI https://github.com/embree/embree/archive/v${EMBREE_VERSION}.zip) set(EMBREE_HASH 3d4a1147002ff43939d45140aa9d6fb8) ++<<<<<<< HEAD +set(IGL_VERSION 2.0.0) +set(IGL_URI https://github.com/libigl/libigl/archive/v${IGL_VERSION}.tar.gz) +set(IGL_HASH 42518e6b106c7209c73435fd260ed5d34edeb254852495b4c95dce2d95401328) + +#should match qex, but what about comiso ? +set(OPENMESH_VERSION 8.0) +set(OPENMESH_URI http://www.openmesh.org/media/Releases/${OPENMESH_VERSION}/OpenMesh-${OPENMESH_VERSION}.tar.gz) +#set(OPENMESH_HASH 96c595c1683b1ad950e80464ae5fc1f3c8dc45c31c8a211122a23e16a076ab23) #3.0 +set(OPENMESH_HASH 8974d44026cacaa37b171945b5c96a284bfd32c9df9d671d62931050d057ec82) + +#latest uid in git as of 2016-10-25 +set(QEX_GIT_UID 1d33e0d6700dd3d00df984aad776d9537fcf16af) +set(QEX_URI https://github.com/hcebke/libQEx/archive/${QEX_GIT_UID}.tar.gz) +set(QEX_HASH a29cf440c7b83c9e803d1f55247cd18e9c277b3845edce5d381c4c91daa90452) + +#latest uid in release branch 3.8.0 +set(LAPACK_GIT_UID ba3779a6813d84d329b73aac86afc4e041170609) +set(LAPACK_URI https://github.com/Reference-LAPACK/lapack-release/archive/${LAPACK_GIT_UID}.tar.gz) +set(LAPACK_HASH 4bd7a3014ee2b5c7cdcdc8960c9476b689f21796715aa03fd719c92c43faee31) + ++======= + set(OIDN_VERSION 1.0.0) + set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.zip) + set(OIDN_HASH 19fe67b0164e8f020ac8a4f520defe60) ++>>>>>>> master diff --cc build_files/cmake/platform/platform_win32.cmake index 1cde41599d0,42ac285f88d..7691942a15f --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@@ -343,16 -347,16 +347,16 @@@ if(WITH_PYTHON set(PYTHON_VERSION 3.7) # CACHE STRING) string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION}) - # Use shared libs for vc2008 and vc2010 until we actually have vc2010 libs - set(PYTHON_LIBRARY ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.lib) - unset(_PYTHON_VERSION_NO_DOTS) - - # Shared includes for both vc2008 and vc2010 - set(PYTHON_INCLUDE_DIR ${LIBDIR}/python/include/python${PYTHON_VERSION}) + set(PYTHON_LIBRARY ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/libs/python${_PYTHON_VERSION_NO_DOTS}.lib) + set(PYTHON_LIBRARY_DEBUG ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/libs/python${_PYTHON_VERSION_NO_DOTS}_d.lib) + set(PYTHON_INCLUDE_DIR ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/include) + set(PYTHON_NUMPY_INCLUDE_DIRS ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/lib/site-packages/numpy/core/include) + set(NUMPY_FOUND On) + unset(_PYTHON_VERSION_NO_DOTS) # uncached vars set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}") - set(PYTHON_LIBRARIES debug "${PYTHON_LIBRARY_DEBUG}" optimized "${PYTHON_LIBRARY}" ) + set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}") endif() if(WITH_BOOST) diff --cc release/scripts/startup/bl_ui/properties_data_mesh.py index 26a0e261c00,47c90199031..ebb9be9a2a4 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@@ -457,13 -457,8 +457,14 @@@ class DATA_PT_vertex_colors(MeshButtons col = row.column(align=True) col.operator("mesh.vertex_color_add", icon='ADD', text="") -- col.operator("mesh.vertex_color_remove", icon='REMOVE', text="") - ++ col.operator("mesh.vertex_color_remove", icon='REMOVE', text="") ++ + row = layout.row() + col = row.column() + col.operator("object.vertex_to_loop_colors", text="Store sculpt color") + col.operator("object.loop_to_vertex_colors", text="Load sculpt color") + + class DATA_PT_remesh(MeshButtonsPanel, Panel): bl_label = "Remesh" bl_options = {'DEFAULT_CLOSED'} @@@ -475,11 -470,10 +476,11 @@@ col = layout.column() mesh = context.mesh - col.prop(mesh, "voxel_size") - col.prop(mesh, "smooth_normals") + col.prop(mesh, "remesh_voxel_size") + col.prop(mesh, "remesh_smooth_normals") + col.prop(mesh, "reproject_vertex_paint") - col.prop(mesh, "reproject_paint_mask") - col.operator("object.remesh", text="Remesh") + col.prop(mesh, "remesh_preserve_paint_mask") + col.operator("object.voxel_remesh", text="Voxel Remesh") class DATA_PT_customdata(MeshButtonsPanel, Panel): diff --cc release/scripts/startup/bl_ui/space_view3d_toolbar.py index 71a0a5925ce,5246d8fa864..509b98d46c1 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@@ -315,28 -363,6 +363,24 @@@ class VIEW3D_PT_tools_brush(Panel, View if not self.is_popover: brush_basic_sculpt_settings(col, context, brush) + # normal_radius_factor + col.separator() + row = col.row() + row.prop(brush, "normal_radius_factor", slider=True) + - col.separator() - row = col.row() - row.prop(brush, "curve_preset") - + col.separator() + row = col.row() + row.prop(brush, "automasking_mode") + + col.separator() + row = col.row() + row.prop(brush, "sculpt_color_mix_mode") + + if brush.sculpt_tool == 'GRAB': + col.separator() + row = col.row() + row.prop(brush, "grab_active_vertex") + # topology_rake_factor if ( capabilities.has_topology_rake and diff --cc source/blender/blenkernel/BKE_paint.h index 54cd51b3bff,37667599488..a88e2304d20 --- a/source/blender/blenkernel/BKE_paint.h +++ b/source/blender/blenkernel/BKE_paint.h @@@ -262,30 -258,9 +261,32 @@@ typedef struct SculptSession float (*layer_co)[3]; /* Copy of the mesh vertices' locations */ struct StrokeCache *cache; + struct FilterCache *filter_cache; + + float cursor_radius; + float cursor_location[3]; + float cursor_view_normal[3]; + float cursor_normal[3]; + + /* Automasking active vertex */ + MVert *active_vertex_mesh; + int active_vertex_mesh_index; + + float pivot_pos[3]; + float pivot_rot[4]; + float pivot_scale[3]; + + float init_pivot_pos[3]; + float init_pivot_rot[4]; + float init_pivot_scale[3]; + + RegionView3D *rv3d; + + int *preview_vert_index_list; + int preview_vert_index_count; + int active_vertex_index; + union { struct { struct SculptVertexPaintGeomMap gmap; diff --cc source/blender/blenloader/intern/versioning_280.c index f21d3692cc5,149b02e7761..c88bdd7ee9d --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@@ -3537,16 -3644,53 +3650,60 @@@ void blo_do_versions_280(FileData *fd, LISTBASE_FOREACH (bArmature *, arm, &bmain->armatures) { arm->flag &= ~(ARM_FLAG_UNUSED_6); } + + Brush *br; + for (br = bmain->brushes.first; br; br = br->id.next) { + if (br->ob_mode & OB_MODE_SCULPT) { + br->normal_radius_factor = 0.2f; + } + } } + if (!MAIN_VERSION_ATLEAST(bmain, 281, 1)) { + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { + for (ModifierData *md = ob->modifiers.first; md; md = md->next) { + if (md->type == eModifierType_DataTransfer) { + /* Now datatransfer's mix factor is multiplied with weights when any, + * instead of being ignored, + * we need to take care of that to keep 'old' files compatible. */ + DataTransferModifierData *dtmd = (DataTransferModifierData *)md; + if (dtmd->defgrp_name[0] != '\0') { + dtmd->mix_factor = 1.0f; + } + } + } + } + } + { /* Versioning code until next subversion bump goes here. */ + if (U.view_rotate_sensitivity_turntable == 0) { + U.view_rotate_sensitivity_turntable = DEG2RADF(0.4f); + U.view_rotate_sensitivity_trackball = 1.0f; + } + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { + for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { + for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { + if (sl->spacetype == SPACE_TEXT) { + ListBase *regionbase = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase; + ARegion *ar = do_versions_find_region_or_null(regionbase, RGN_TYPE_UI); + if (ar) { + ar->alignment = RGN_ALIGN_RIGHT; + } + } + /* Mark outliners as dirty for syncing and enable synced selection */ + if (sl->spacetype == SPACE_OUTLINER) { + SpaceOutliner *soutliner = (SpaceOutliner *)sl; + soutliner->sync_select_dirty |= WM_OUTLINER_SYNC_SELECT_FROM_ALL; + soutliner->flag |= SO_SYNC_SELECT; + } + } + } + } + for (Mesh *mesh = bmain->meshes.first; mesh; mesh = mesh->id.next) { + if (mesh->remesh_voxel_size == 0.0f) { + mesh->remesh_voxel_size = 0.1f; + } + } } } diff --cc source/blender/editors/object/object_ops.c index 1a8aa3c2a1d,38c06319450..b9a38d0d721 --- a/source/blender/editors/object/object_ops.c +++ b/source/blender/editors/object/object_ops.c @@@ -258,18 -258,7 +258,19 @@@ void ED_operatortypes_object(void WM_operatortype_append(OBJECT_OT_hide_view_set); WM_operatortype_append(OBJECT_OT_hide_collection); - WM_operatortype_append(OBJECT_OT_remesh); + WM_operatortype_append(OBJECT_OT_vertex_to_loop_colors); + WM_operatortype_append(OBJECT_OT_loop_to_vertex_colors); + + WM_operatortype_append(OBJECT_OT_paint_mask_extract); + + WM_operatortype_append(REMESH_OT_csg_add); + WM_operatortype_append(REMESH_OT_csg_remove); + WM_operatortype_appe @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs