Blender Git Loki
Git Commits -> Revision f84e8e7
Revision f84e8e7 by Tamito Kajiyama (master) October 6, 2011, 02:04 (GMT) |
Fine control of feature edge selection with mesh face and edge marks. New "face marks" and "edge marks" have been introduced in mesh data blocks. In the edit mode of a mesh object, face marks can be put to selected faces by choosing Mesh >> Faces >> Mark Freestyle Face from the menu of a 3D View window or Ctrl-F >> Mark Freestyle Face from the context menu. Similarly, edge marks can be put to selected edges by Mesh >> Edges >> Mark Freestyle Edge or Ctrl-E >> Mark Freestyle Edge. These marks should work fine with the Subdivision surface modifier. Moreover, two new conditions for feature edge selection have been added to the Parameter Editor mode as described below: 1. The Selection by Edge Types option has now the new Edge Mark type, which can be used to (de)select feature edges having edge marks. This option can be used to add to (or remove from) the view map arbitrary edges of mesh objects. 2. Selection by Face Marks option has been newly introduced, in which face marks are used for feature edge selection in two ways. One option is called "One Face" which is to (de)select feature edges if one of faces on the left and right of each feature edge has a face mark. The other option is "Both Faces" to (de)select feature edges if both faces on the left and right have a face mark. |
Commit Details:
Full Hash: f84e8e76406a30bd15e6e55e41714e62826315aa
SVN Revision: 40811
Parent Commit: cb4f662
Lines Changed: +724, -51
45 Modified Paths:
/release/scripts/freestyle/style_modules/parameter_editor.py (+39, -0) (Diff)
/release/scripts/startup/bl_ui/properties_render.py (+9, -0) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+12, -0) (Diff)
/source/blender/blenkernel/intern/BME_conversions.c (+2, -0) (Diff)
/source/blender/blenkernel/intern/cdderivedmesh.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+2, -0) (Diff)
/source/blender/blenkernel/intern/subsurf_ccg.c (+2, -2) (Diff)
/source/blender/blenlib/BLI_editVert.h (+1, -1) (Diff)
/source/blender/editors/include/UI_resources.h (+4, -1) (Diff)
/source/blender/editors/interface/resources.c (+19, -0) (Diff)
/source/blender/editors/mesh/editface.c (+6, -0) (Diff)
/source/blender/editors/mesh/editmesh.c (+6, -1) (Diff)
/source/blender/editors/mesh/editmesh_mods.c (+71, -0) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+52, -0) (Diff)
/source/blender/editors/mesh/mesh_intern.h (+2, -0) (Diff)
/source/blender/editors/mesh/mesh_ops.c (+2, -0) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+42, -16) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp (+45, -6) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h (+5, -2) (Diff)
/source/blender/freestyle/intern/python/BPy_Nature.cpp (+8, -1) (Diff)
/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp (+68, -0) (Diff)
/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp (+33, -0) (Diff)
/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp (+15, -0) (Diff)
/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h (+11, -0) (Diff)
/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp (+21, -0) (Diff)
/source/blender/freestyle/intern/view_map/FEdgeXDetector.h (+11, -0) (Diff)
/source/blender/freestyle/intern/view_map/Silhouette.h (+25, -0) (Diff)
/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp (+8, -0) (Diff)
/source/blender/freestyle/intern/winged_edge/Nature.h (+2, -0) (Diff)
/source/blender/freestyle/intern/winged_edge/WEdge.cpp (+13, -5) (Diff)
/source/blender/freestyle/intern/winged_edge/WEdge.h (+9, -3) (Diff)
/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp (+24, -4) (Diff)
/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h (+3, -0) (Diff)
/source/blender/freestyle/intern/winged_edge/WXEdge.cpp (+4, -4) (Diff)
/source/blender/freestyle/intern/winged_edge/WXEdge.h (+2, -2) (Diff)
/source/blender/makesdna/DNA_freestyle_types.h (+4, -0) (Diff)
/source/blender/makesdna/DNA_meshdata_types.h (+2, -0) (Diff)
/source/blender/makesdna/DNA_mesh_types.h (+3, -0) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_mesh.c (+20, -0) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+34, -1) (Diff)
/source/blender/makesrna/intern/rna_userdef.c (+10, -0) (Diff)
/source/blender/render/intern/include/render_types.h (+8, -0) (Diff)
/source/blender/render/intern/source/convertblender.c (+62, -2) (Diff)
/release/scripts/startup/bl_ui/properties_render.py (+9, -0) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+12, -0) (Diff)
/source/blender/blenkernel/intern/BME_conversions.c (+2, -0) (Diff)
/source/blender/blenkernel/intern/cdderivedmesh.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+2, -0) (Diff)
/source/blender/blenkernel/intern/subsurf_ccg.c (+2, -2) (Diff)
/source/blender/blenlib/BLI_editVert.h (+1, -1) (Diff)
/source/blender/editors/include/UI_resources.h (+4, -1) (Diff)
/source/blender/editors/interface/resources.c (+19, -0) (Diff)
/source/blender/editors/mesh/editface.c (+6, -0) (Diff)
/source/blender/editors/mesh/editmesh.c (+6, -1) (Diff)
/source/blender/editors/mesh/editmesh_mods.c (+71, -0) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+52, -0) (Diff)
/source/blender/editors/mesh/mesh_intern.h (+2, -0) (Diff)
/source/blender/editors/mesh/mesh_ops.c (+2, -0) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+42, -16) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp (+45, -6) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h (+5, -2) (Diff)
/source/blender/freestyle/intern/python/BPy_Nature.cpp (+8, -1) (Diff)
/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp (+68, -0) (Diff)
/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp (+33, -0) (Diff)
/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp (+15, -0) (Diff)
/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h (+11, -0) (Diff)
/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp (+21, -0) (Diff)
/source/blender/freestyle/intern/view_map/FEdgeXDetector.h (+11, -0) (Diff)
/source/blender/freestyle/intern/view_map/Silhouette.h (+25, -0) (Diff)
/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp (+8, -0) (Diff)
/source/blender/freestyle/intern/winged_edge/Nature.h (+2, -0) (Diff)
/source/blender/freestyle/intern/winged_edge/WEdge.cpp (+13, -5) (Diff)
/source/blender/freestyle/intern/winged_edge/WEdge.h (+9, -3) (Diff)
/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp (+24, -4) (Diff)
/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h (+3, -0) (Diff)
/source/blender/freestyle/intern/winged_edge/WXEdge.cpp (+4, -4) (Diff)
/source/blender/freestyle/intern/winged_edge/WXEdge.h (+2, -2) (Diff)
/source/blender/makesdna/DNA_freestyle_types.h (+4, -0) (Diff)
/source/blender/makesdna/DNA_meshdata_types.h (+2, -0) (Diff)
/source/blender/makesdna/DNA_mesh_types.h (+3, -0) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_mesh.c (+20, -0) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+34, -1) (Diff)
/source/blender/makesrna/intern/rna_userdef.c (+10, -0) (Diff)
/source/blender/render/intern/include/render_types.h (+8, -0) (Diff)
/source/blender/render/intern/source/convertblender.c (+62, -2) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021