Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-14Merge remote-tracking branch 'origin/master' into soc-2019-nprYimingWu
2019-09-10Sculpt: Mask Extract operatorPablo Dobarro
This operator extracts the paint mask to a new mesh object. It can extract the paint mask creating a boundary loop in the geometry, making it ready for adding a subdivision surface modifier. Reviewed By: brecht Differential Revision: https://developer.blender.org/D5384
2019-09-04Merge remote-tracking branch 'origin/master' into soc-2019-nprYimingWu
2019-08-27Edit Mesh: Poly build tool improvementsPablo Dobarro
This commit changes the functionality of the Poly build tool to make it more suitable for retopology tasks: - Click and drag from a boundary edge extrudes a new quad - Click and drag on vertices tweaks the position - Ctrl + click adds geometry. There is a geometry preview in the gizmo. It also can automatically convert triangles to quads. - Shift + click deletes mesh elements (faces or vertices) - Updated preselection code. Different mesh elements take priority depending on the selected action. Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D5573
2019-07-19LANPR: Rename freestyle edge mark functions to LANPR.YimingWu
2019-05-28Clang format the code.YimingWu
2019-05-06Merge branch 'master' into soc-2018-nprYimingWu
2019-05-05UI: TooltipsWilliam Reynish
- Add missing tooltips to Quick Effects and Subdivide Edge Ring - Add proper tooltip to the Bevel operator - Clearer tooltips for the extrude operators Plus a few other tweaks Suggested by users on Devtalk.
2019-04-30UI: reorganize proportional editing optionsCampbell Barton
- Move connected & projected into individual toggles. - Top-level proportional editing button now only toggles. - Use popover for proportional edit-mode falloff and options. Note that it's no longer possible to toggle connected via key bindings, although this could be supported again if it's needed. Resolves T58081
2019-04-20Merge branch 'master' into soc-2018-npr Fix errorsYiming Wu
# Conflicts: # intern/opensubdiv/internal/opensubdiv_evaluator.cc # intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc # release/scripts/startup/bl_ui/properties_data_modifier.py # source/blender/CMakeLists.txt # source/blender/blenkernel/intern/scene.c # source/blender/blenloader/intern/readfile.c # source/blender/blenloader/intern/versioning_280.c # source/blender/blenloader/intern/writefile.c # source/blender/bmesh/intern/bmesh_polygon.c # source/blender/draw/CMakeLists.txt # source/blender/draw/intern/draw_manager.c # source/blender/draw/modes/object_mode.c # source/blender/editors/mesh/editmesh_tools.c # source/blender/editors/mesh/mesh_ops.c # source/blender/editors/render/render_intern.h # source/blender/editors/render/render_ops.c # source/blender/editors/space_outliner/outliner_draw.c # source/blender/editors/space_view3d/space_view3d.c # source/blender/makesdna/DNA_light_types.h # source/blender/makesdna/DNA_modifier_types.h # source/blender/makesdna/DNA_scene_types.h # source/blender/makesdna/intern/makesdna.c # source/blender/makesrna/intern/CMakeLists.txt # source/blender/makesrna/intern/makesrna.c # source/blender/makesrna/intern/rna_modifier.c # source/blender/makesrna/intern/rna_scene.c # source/blender/modifiers/CMakeLists.txt # source/blender/modifiers/intern/MOD_util.c
2019-04-17ClangFormat: apply to source, most of internCampbell Barton
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-03-08Merge branch 'master' into soc-2018-nprYiming Wu
# Conflicts: # release/datafiles/locale # release/scripts/addons # release/scripts/addons_contrib # source/blender/draw/intern/DRW_render.h # source/blender/makesdna/DNA_light_types.h # source/blender/makesdna/DNA_scene_types.h # source/blender/makesrna/intern/rna_scene.c # source/tools
2019-02-18doxygen: add newline after \fileCampbell Barton
While \file doesn't need an argument, it can't have another doxy command after it.
2019-02-11Bevel: Make modal keymap instead of hardcoded.Howard Trickey
Also added keys for toggling harden normals, and cycling through miter types. Still to do: add some shortcuts for affecting the spread value for arc miters.
2019-02-06Cleanup: remove redundant doxygen \file argumentCampbell Barton
Move \ingroup onto same line to be more compact and make it clear the file is in the group.
2019-02-01Cleanup: remove redundant, invalid info from headersCampbell Barton
BF-admins agree to remove header information that isn't useful, to reduce noise. - BEGIN/END license blocks Developers should add non license comments as separate comment blocks. No need for separator text. - Contributors This is often invalid, outdated or misleading especially when splitting files. It's more useful to git-blame to find out who has developed the code. See P901 for script to perform these edits.
2019-01-26Cleanup: remove redundant BKE/BLI/BIF headersCampbell Barton
2018-11-14Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-nprNick Wu
2018-11-09Keymap: move builtin keymaps from C to PythonBrecht Van Lommel
This should be purely an implementation change, for end users there should be no functional difference. The entire key configuration is in one file with ~5000 lines of code. Mostly avoiding code duplication and preserve comments and utility functions from the C code. It's a bit long but for searching and editing it's also convenient to have it all in one file. Notes: - Actual keymap is shared by blender / blender_legacy and stored in `keymap_data/blender_default.py` This only generates JSON-like data to be passed into `keyconfig_import_from_data`, allowing other presets to load and manipulate the default keymap. - Each preset defines 'keyconfig_data' which can be shared between presets. - Some of the utility functions for generating keymap items still need to be ported over to Python. - Some keymap items can be made into loops (marked as TODO). See: D3907
2018-10-03Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-nprNick Wu
# Conflicts: # source/blender/makesrna/intern/rna_scene.c
2018-10-02Merge branch 'master' into blender2.8Campbell Barton
2018-10-02Correct tooltipCampbell Barton
2018-09-12Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-nprNick Wu
# Conflicts: # source/tools
2018-09-10Cleanup: use title capsCampbell Barton
2018-09-10Tool System: use preselect highlight w/ poly-buildCampbell Barton
- Poly build now uses a new gizmo for pre-selection which has the same behavior as loop-cut. This replaces hack where mouse-move set the active element which was no longer working properly because of missing depsgraph updates. - Multi-object support for poly-build. - Support for deformed cage. - Fix error where changing active object wasn't properly refreshing the preselect gizmo (for loopcut too). Currently holding Alt to select non-boundary element's isn't working.
2018-09-04Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-nprNick Wu
# Conflicts: # source/blender/makesdna/DNA_scene_types.h
2018-09-02Cleanup: move select all/none/invert into templateCampbell Barton
2018-09-01Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-nprNick Wu
# Conflicts: # source/blender/CMakeLists.txt
2018-08-31Merge branch 'master' into blender2.8Campbell Barton
2018-08-31Cleanup: rename WM_keymap_find -> WM_keymap_ensureCampbell Barton
2018-08-29Python / Cleanup: rename INFO_MT to TOPBAR_MT/VIEW3D_MT to reflect actual ↵Brecht Van Lommel
location.
2018-08-23Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-nprNick Wu
# Conflicts: # release/scripts/addons # release/scripts/addons_contrib # source/tools
2018-08-22Tool System: loop cut, confirm on releaseCampbell Barton
When accessed as a tool it felt awkward to click twice to execute.
2018-08-21Remove MESH_OT_drop_named_imageDalai Felinto
This was never ported to work with Cycles, so it is basically useless in 2.8. It can always be brought back in the future.
2018-08-16Merge branch 'npr_tess' of https://github.com/DarkDefender/blender into ↵Nick Wu
soc-2018-npr # Conflicts: # release/scripts/addons # release/scripts/addons_contrib # source/blender/editors/space_outliner/outliner_draw.c # source/blender/makesdna/DNA_scene_types.h # source/blender/modifiers/intern/MOD_mybmesh.c # source/tools
2018-08-143D View boarder/lasso select tool optionsCampbell Barton
Add tool options to control how select operates (add/sub/set/and/xor). Note: edit mode armature select still needs to support all options, this is complicated by how it handles partial end-point selection.
2018-08-10Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-nprNick Wu
# Conflicts: # release/datafiles/locale # release/scripts/addons_contrib # source/blender/editors/mesh/editmesh_tools.c # source/blender/editors/space_outliner/outliner_draw.c # source/blender/makesdna/DNA_modifier_types.h # source/blender/makesrna/intern/rna_modifier.c # source/blender/modifiers/MOD_modifiertypes.h # source/blender/modifiers/intern/MOD_util.c # source/tools
2018-08-01Merge branch 'blender2.8' into soc-2018-bevelBastien Montagne
Conflicts: release/scripts/addons release/scripts/startup/bl_ui/space_view3d_toolbar.py source/blender/editors/space_outliner/outliner_draw.c
2018-07-25Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-nprNick Wu
2018-07-25Keymap: Use 1..4 to change UV select modesCampbell Barton
Support for sync selection switching which keys apply.
2018-07-21Merge branch 'blender2.8' into soc-2018-bevelRohan Rathi
2018-07-16Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-nprNick Wu
# Conflicts: # intern/opensubdiv/opensubdiv_evaluator_capi.cc # release/scripts/startup/bl_ui/properties_scene.py
2018-07-15WM: rename manipulator to gizmo internallyCampbell Barton
2018-07-12Keymap: Modifiers to control mesh elem switchingCampbell Barton
Shift/Ctrl control extend/expand when number keys are used to switch modes.
2018-07-05Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-nprNick Wu
2018-07-04Keymap: Resolve inconsistencies, T55162Campbell Barton
2018-07-03Keymap: Select/De-Select now use A, Alt-ACampbell Barton
There are still some keys to update because some operators only support toggle.
2018-07-03Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-nprNick Wu
2018-07-02Merge branch 'blender2.8' into soc-2018-bevelRohan Rathi
2018-07-02Keymap: add back X-Key for deleteCampbell Barton
This is needed as part of modeling work-flow, so keep it accessible.