Blender Git Loki
Git Commits -> Revision fc4d697
Revision fc4d697 by Rohan Rathi July 28, 2017, 05:31 (GMT) |
Squashed commit of the following: commit 7c8ecd9226090326e1069f392af6392eef5aa97b Merge: 33a95c40a35 1bd9531fda7 Author: Rohan Rathi <[email protected]> Date: Thu Jul 27 22:37:53 2017 +0530 Merge branch 'master' into soc-2017-normal-tools commit 33a95c40a35a2adfeb30f8cf8030edbf1aa47a1b Merge: d586e5557be edc6bec9d60 Author: Rohan Rathi <[email protected]> Date: Wed Jul 26 14:50:24 2017 +0530 Merge branch 'master' into soc-2017-normal-tools commit d586e5557be5a66d19c4934c184a706f6ce894c5 Author: Rohan Rathi <[email protected]> Date: Wed Jul 26 14:45:15 2017 +0530 Changed set_normals_from_faces to respect sharp edges. commit 86e63507470b05cfe290adcbd925879fa8445b48 Author: Rohan Rathi <[email protected]> Date: Tue Jul 25 23:18:41 2017 +0530 Fixed issues with Copy Normals commit 3858f956db41f7c61b04041937e7ff7b0dd468db Author: Rohan Rathi <[email protected]> Date: Sat Jul 22 17:37:02 2017 +0530 Added weighted normal modifier. Has a weight int which specifies the weights with which face area/corner angle will be exponentially divided. Threshold provides the limit in values which will be weighted equally. commit 604bd8799e88960bb3472178f25c4f3889b0c791 Author: Rohan Rathi <[email protected]> Date: Tue Jul 18 18:40:50 2017 +0530 Added snapping to rotate normal. Also added a ui function to point_normals which allows easier editing by creating a sphere box. Shown when align is enabled. commit 94007a1769864dc0c509f5d46da26adde74b6f70 Merge: 51d49a0f7c0 5c30bc285cd Author: Rohan Rathi <[email protected]> Date: Sun Jul 16 18:50:00 2017 +0530 Merge branch 'master' into soc-2017-normal-tools commit 51d49a0f7c00111a85bf797ca765d9d3f07acd66 Author: Rohan Rathi <[email protected]> Date: Thu Jul 13 20:50:39 2017 +0530 Added ability to copy clnors. Also contains commented code for averaging, I'll finish it after weighting modes. No hotkeys for copy (yet). You can copy either face normals or single loop normals. Here single loop normal means: selecting a vert then a face of the vert will copy loop normal of the face associated with this vert. So, standard vert ->click-> copy wont work. click on vert then copy will work if a) Loops of vert are merged b) Loops of vert have same normal value. Pasting works with the same standard selection rules commit 9773709cf1fc53476ddc63abe1756e0584d24fee Author: Rohan Rathi <[email protected]> Date: Wed Jul 12 21:34:15 2017 +0530 Optimised split to faces and fixed preserve_clnor not keeping clnors commit d438bbfa4378e6a204553ee96b12287fd89df2c4 Merge: 4a7653005b9 440c91b1f64 Author: Rohan Rathi <[email protected]> Date: Mon Jul 10 17:05:25 2017 +0530 Merge branch 'master' into soc-2017-normal-tools commit 4a7653005b99d3f0f186f9c9f80ca979fb15d7e6 Author: Rohan Rathi <[email protected]> Date: Mon Jul 10 17:00:22 2017 +0530 Now invalidates all loops in an lnor space commit 626c9888d7d0fe6038a90a3d5abebf4f641fb7f4 Author: Rohan Rathi <[email protected]> Date: Tue Jul 4 23:53:06 2017 +0530 cleanup of point_normals and added poll commit 55237cfe975e210b1b1cbc865ad5b87040c135fd Merge: 7376444b842 15fd758bd63 Author: Rohan Rathi <[email protected]> Date: Tue Jul 4 11:47:40 2017 +0530 Merge branch 'master' into soc-2017-normal-tools commit 7376444b842786252da67551dbad756d8cf76217 Author: Rohan Rathi <[email protected]> Date: Tue Jul 4 11:31:24 2017 +0530 Fixed all clnors in lnorspace not updating commit 28061ac85e5d45e7a8cac9b6f678a3c6765f76c2 Author: Rohan Rathi <[email protected]> Date: Mon Jul 3 13:02:00 2017 +0530 Fixed bugs and cleanup commit 448c61b8610b7ae4d9056411762cc21afafe1667 Author: Rohan Rathi <[email protected]> Date: Sat Jul 1 12:03:08 2017 +0530 Added Split/Merge normals. Doesn't work on the basis of any weighting mode. Will have to implement that first. I'll add more methods as I progress in other areas. commit 41b118c9d96514399f464e21fb778200cd687541 Merge: 5c8a38a8588 bb0e8f1c552 Author: Bastien Montagne <[email protected]> Date: Tue Jun 27 15:08:56 2017 +0200 Merge branch 'master' into soc-2017-normal-tools Conflicts: source/blender/python/intern/bpy_props.c commit 5c8a38a8588e6acf34ad175b580a2d007db6c95d Author: Rohan Rathi <[email protected]> Date: Fri Jun 23 11:35:45 2017 +0530 Added ability to edit individual normal. Works by using multiple selection modes, so if yo works by using multiple selection modes, so if you select vert then face. Th Works by using multiple selection modes. So, if you select vert then face, only clnor linked with both vert and face will be edited. Has some issues though, as vert + edge selection can be associated to either of 2 clnors. Need to fix. commit a2ad1b4e88e155fa0b7457312373c49eeb13754d Author: Rohan Rathi <[email protected]> Date: Tue Jun 20 23:03:32 2017 +0530 Added invalidate for transform ops. Can now keep clnors when transform ops are applied. As now invalidation for each function is harder to keep track of, Added a function which rebuilds all the lnor spaces in the mesh when BM_lnorspace_rebuild is called to detect if any unmarked spaces are rebuilt. commit 137bcc528aeb93ce00294ccf377995392979c99e Author: Rohan Rathi <[email protected]> Date: Mon Jun 19 11:11:04 2017 +0530 Merge branch 'master' into soc-2017-normal-tools commit 66199cf5409cbc275974ffc92e1981c227758bfb Author: Rohan Rathi <[email protected]> Date: Mon Jun 19 11:00:48 2017 +0530 Added normals to follow mouse location. Now M key can be used after ALT - L to have clnors point to mouse location. commit 1516d8d1d1de3ec178c28e4146b470ae86332dd0 Author: Rohan Rathi <[email protected]> Date: Thu Jun 15 20:27:01 2017 +0530 Added point to origin and LMB click commit 19ff231ff5bbc62425a5c81b00bd3712bc34e01b Author: Rohan Rathi <[email protected]> Date: Tue Jun 13 11:34:03 2017 +0530 Fixed issues with Point Normals. Added header, fixed bugs and logic errors in point normals to target. Target location is now editable from UI. Also renamed 'bmspacearr' to 'lnor_spacearr' commit 201689daeb30448f0fa25d3561961b9a33bbf9a6 Author: Bastien Montagne <[email protected]> Date: Mon Jun 12 09:32:15 2017 +0200 Remove support of lnorspacearray in editmesh undo/redo, fix memleak. Supporting lnorspacearray in undo/redo would require a deep copy of lnor spaces, not only a shallow copy of top struct. And it would eat a fair amount of memory, think we'd rather recompute those on undo for now! Also, fixed memory leaked by not correctly freeing lnorspace array on BMesh deletion. commit 15279c04d7946946f7b56f97783338958e4f2e0a Author: Bastien Montagne <[email protected]> Date: Mon Jun 12 09:22:19 2017 +0200 Do not include BKE_mesh.h in bmesh_class.h We absolutely avoid such include unless totally mandatory, here we can simply keep lnorspaces array a pointer in BMesh struct, and allocate it on demand. Also, was breaking bmesh tests building. Note: this totally breaks undo/redo, but previous code was utterly wrong here as well (shallow copy of lnorspaces, ending up sharing whole internal memory -> crash garanteed ;) ). Think we can skip that struct for undo/redo for now at least, we can rebuild it in those cases imho... commit cd9939fa50472ff38ab6266d53264d8f93915414 Merge: 9673aa8c151 00c4f49a6d8 Author: Bastien Montagne <[email protected]> Date: Mon Jun 12 08:52:23 2017 +0200 Merge branch 'master' into soc-2017-normal-tools commit 9673aa8c151b463e05922b192bcd403c2c7c319e Author: Rohan Rathi <[email protected]> Date: Sun Jun 11 23:21:42 2017 +0530 Added point normals to target. Moved common loop functions and made changes to structure commit bf892c10fc353aee82cf423de4bebbac5ac7dbd6 Author: RohanRathi <[email protected]> Date: Tue Jun 6 11:00:47 2017 +0530 Added ability to rotate custom normal commit 5bc15b3f75d5f5ad761b5d7c9ae60d96b8f6b58e Author: RohanRathi <[email protected]> Date: Fri Jun 2 11:46:19 2017 +0530 Added clnor invalidate for all BMOps commit cf811e7828d75d9e4b4e83869e60a0069010f68f Author: RohanRathi <[email protected]> Date: Thu Jun 1 11:00:56 2017 +0530 Cached lnorspace array and added dirty Mechanic |
Commit Details:
Full Hash: fc4d697408fe6eb5e7ade9e42f1be3b576889a72
Parent Commit: 3b177e8
Lines Changed: +1985, -129
1 Added Path:
/source/blender/modifiers/intern/MOD_weighted_normal.c (+299, -0) (View)
27 Modified Paths:
/release/scripts/startup/bl_operators/mesh.py (+0, -50) (Diff)
/release/scripts/startup/bl_ui/properties_data_modifier.py (+8, -0) (Diff)
/release/scripts/startup/bl_ui/space_view3d_toolbar.py (+26, -0) (Diff)
/source/blender/blenkernel/intern/editderivedmesh.c (+1, -1) (Diff)
/source/blender/bmesh/bmesh_class.h (+30, -0) (Diff)
/source/blender/bmesh/intern/bmesh_mesh.c (+365, -5) (Diff)
/source/blender/bmesh/intern/bmesh_mesh.h (+12, -1) (Diff)
/source/blender/bmesh/intern/bmesh_opdefines.c (+86, -43) (Diff)
/source/blender/bmesh/intern/bmesh_operator_api.h (+1, -0) (Diff)
/source/blender/editors/include/ED_screen.h (+1, -0) (Diff)
/source/blender/editors/include/ED_transform.h (+2, -0) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+803, -0) (Diff)
/source/blender/editors/mesh/editmesh_undo.c (+2, -0) (Diff)
/source/blender/editors/mesh/editmesh_utils.c (+4, -1) (Diff)
/source/blender/editors/mesh/mesh_intern.h (+5, -0) (Diff)
/source/blender/editors/mesh/mesh_ops.c (+8, -0) (Diff)
/source/blender/editors/screen/screen_ops.c (+9, -0) (Diff)
/source/blender/editors/transform/transform.c (+217, -16) (Diff)
/source/blender/editors/transform/transform.h (+4, -0) (Diff)
/source/blender/editors/transform/transform_generics.c (+3, -0) (Diff)
/source/blender/editors/transform/transform_ops.c (+40, -12) (Diff)
/source/blender/makesdna/DNA_modifier_types.h (+15, -0) (Diff)
/source/blender/makesrna/intern/rna_modifier.c (+40, -0) (Diff)
/source/blender/makesrna/RNA_access.h (+1, -0) (Diff)
/source/blender/modifiers/CMakeLists.txt (+1, -0) (Diff)
/source/blender/modifiers/intern/MOD_util.c (+1, -0) (Diff)
/source/blender/modifiers/MOD_modifiertypes.h (+1, -0) (Diff)
/release/scripts/startup/bl_ui/properties_data_modifier.py (+8, -0) (Diff)
/release/scripts/startup/bl_ui/space_view3d_toolbar.py (+26, -0) (Diff)
/source/blender/blenkernel/intern/editderivedmesh.c (+1, -1) (Diff)
/source/blender/bmesh/bmesh_class.h (+30, -0) (Diff)
/source/blender/bmesh/intern/bmesh_mesh.c (+365, -5) (Diff)
/source/blender/bmesh/intern/bmesh_mesh.h (+12, -1) (Diff)
/source/blender/bmesh/intern/bmesh_opdefines.c (+86, -43) (Diff)
/source/blender/bmesh/intern/bmesh_operator_api.h (+1, -0) (Diff)
/source/blender/editors/include/ED_screen.h (+1, -0) (Diff)
/source/blender/editors/include/ED_transform.h (+2, -0) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+803, -0) (Diff)
/source/blender/editors/mesh/editmesh_undo.c (+2, -0) (Diff)
/source/blender/editors/mesh/editmesh_utils.c (+4, -1) (Diff)
/source/blender/editors/mesh/mesh_intern.h (+5, -0) (Diff)
/source/blender/editors/mesh/mesh_ops.c (+8, -0) (Diff)
/source/blender/editors/screen/screen_ops.c (+9, -0) (Diff)
/source/blender/editors/transform/transform.c (+217, -16) (Diff)
/source/blender/editors/transform/transform.h (+4, -0) (Diff)
/source/blender/editors/transform/transform_generics.c (+3, -0) (Diff)
/source/blender/editors/transform/transform_ops.c (+40, -12) (Diff)
/source/blender/makesdna/DNA_modifier_types.h (+15, -0) (Diff)
/source/blender/makesrna/intern/rna_modifier.c (+40, -0) (Diff)
/source/blender/makesrna/RNA_access.h (+1, -0) (Diff)
/source/blender/modifiers/CMakeLists.txt (+1, -0) (Diff)
/source/blender/modifiers/intern/MOD_util.c (+1, -0) (Diff)
/source/blender/modifiers/MOD_modifiertypes.h (+1, -0) (Diff)