Blender Git Loki
Git Commits -> Revision 5a7eeca
Revision 5a7eeca by Rohan Rathi September 5, 2017, 13:27 (GMT) |
Squashed commit of the following: commit dca08a4440fdc5670bffab9b28120fdacd53364c Merge: 986b1f6f327 b0bbb5f34f4 Author: Rohan Rathi <[email protected]> Date: Tue Sep 5 16:25:51 2017 +0530 Merge branch 'master' into soc-2017-normal-tools commit 986b1f6f32708b658fea2b77000253b37820e559 Author: Rohan Rathi <[email protected]> Date: Sat Sep 2 12:13:47 2017 +0530 Added 3 level weighting to modifier. Also did minor cleanup of code commit 18df6576318bf020476a6f87e93484c5f4ab6dd4 Author: Rohan Rathi <[email protected]> Date: Tue Aug 29 19:39:17 2017 +0530 Changed T_CLNOR_INVALIDATE flag as it conflicted with prop edit. Fixed mistake with weighting in modifier making it work differently from average. commit 8c942d9708e24589b87d6ace14b494f6256d72cd Author: Rohan Rathi <[email protected]> Date: Mon Aug 21 22:59:04 2017 +0530 Made changes to split tool commit 1b92a80703b6531ff7caa1421cc44f4d23b8527c Author: Rohan Rathi <[email protected]> Date: Sun Aug 20 21:41:40 2017 +0530 Made UI changes. Removed binary weighting in average. Changed weight calculation. commit 96e76ea4a3e0d988389ed3ba5464696e02028628 Author: Rohan Rathi <[email protected]> Date: Fri Aug 18 20:44:15 2017 +0530 Made workflow changes to copy, paste. Added add and multiply. Did a cleanup of point_normals and split. Added ability to spherize in point_normals. Added reset. Added normal smoothing based on adjacent vertices. Did a cleanup of UI. The set of normal tools now share the normal vector in UI. The copy/paste operator now contains all these methods and has been renamed. commit 342793ef756e0294940e304e251c99f2113b16d9 Author: Rohan Rathi <[email protected]> Date: Tue Aug 15 22:39:39 2017 +0530 Fixed bugs in copy and made UI changes commit 2b5f825ce42e905825a2e14050bfe06dd813c9c7 Author: Rohan Rathi <[email protected]> Date: Sun Aug 13 22:40:32 2017 +0530 Fixed issues with set normals from faces with smooth faces. All loop normals of smooth fan weren't updated commit a917e14afa20a2ca29e8fd8b55382825f296a0cf Author: Rohan Rathi <[email protected]> Date: Sun Aug 13 19:26:25 2017 +0530 Fixed memalloc bug in lnorspacearr and removed BMO_OPTYPE_FLAG_INVALIDATE_CLNOR_ALL flag commit 395119d5cebb7aa6e1c5834b06fb7f825e89aa69 Author: Rohan Rathi <[email protected]> Date: Sat Aug 12 18:19:55 2017 +0530 Changed merge, split and average to make them more coherent. Now merge and split are only used to join/split split normals. All other functionality is transferred over to average. commit 07c700365b80b9d1a868059f2b70f12c98cb77be Author: Rohan Rathi <[email protected]> Date: Sat Aug 12 09:54:52 2017 +0530 Added weighting, sharp edges to average. Made small UI changes. commit 28afe63fb71af94757039ddf5d9867c8757e2956 Author: Rohan Rathi <[email protected]> Date: Fri Aug 11 16:39:41 2017 +0530 changed weight calculation in modifier commit 29e5f37bdd86a106233dff859ff0ed7fa293a412 Author: Bastien Montagne <[email protected]> Date: Mon Aug 7 10:31:19 2017 +0200 Fix memleak in Weighted Normals modifier when autosmooth is disabled. commit 3df612c61fc8e30bc89763ed51dff845c6aa64bc Author: Rohan Rathi <[email protected]> Date: Mon Aug 7 07:17:21 2017 +0530 Fix error in build by including limits.h commit 7eb51ebaae938801ea9287d68ce8867d40d0ea9b Author: Rohan Rathi <[email protected]> Date: Sun Aug 6 23:27:59 2017 +0530 Rewrote the code for sharp edges on weighted modifier. commit 16289abe5042985b66e393058d9e401c664bda82 Merge: c7e8f0d6dac f5f6f9c9ac3 Author: Bastien Montagne <[email protected]> Date: Sun Aug 6 18:42:20 2017 +0200 Merge branch 'master' into soc-2017-normal-tools commit c7e8f0d6dacd3239d9171aa467fc48cce1fb768f Merge: c174f1c8885 e6daa161ddb Author: Rohan Rathi <[email protected]> Date: Fri Aug 4 22:13:59 2017 +0530 Merge branch 'master' into soc-2017-normal-tools commit c174f1c888584a09d70bc75620db2a1517a6144b Author: Rohan Rathi <[email protected]> Date: Fri Aug 4 21:42:59 2017 +0530 Fixed potential memory leak in modifier commit 5aab60e60f78c470a87af7e1eafb6b03a1824d4a Author: Rohan Rathi <[email protected]> Date: Fri Aug 4 21:35:34 2017 +0530 Fixed issues with modifier: Adding vertgroups now does not overwrite data. Also added proper weights to sharp edges commit fd3960a4eb8060c5b86f57778431ee1f0dca4e18 Author: Rohan Rathi <[email protected]> Date: Fri Aug 4 17:39:56 2017 +0530 Fixed vgroups editing all loop data in modifier commit c1af648c33dd9d830bcbfd78540ae5e13e209e60 Author: Rohan Rathi <[email protected]> Date: Thu Aug 3 19:21:35 2017 +0530 Fixed the following for weighted modifier: 1) Now correctly splits loop normal according to sharp edges 2) Modifier now only acts on active vertex group 3) Added a check to use smooth/sharp flags as boolean weights commit d0c25f82966f9bc9b4528814b3bdd074b98edee6 Author: Rohan Rathi <[email protected]> Date: Sun Jul 30 21:38:33 2017 +0530 Added the following to weighted modifier: 1) Modifier now respects sharp edges, requires bool value to be checked. 2) Can now use vertex groups to apply modifier to only selected vgroup 3) Added boolean (0-1) weights in the form of Smooth/Sharp flags. Smooth flag means the face will hold 0 weight. commit 8b4d448ec70fe5e000d74e05333757d3cdbbe806 Author: Rohan Rathi <[email protected]> Date: Fri Jul 28 23:42:01 2017 +0530 Fixed issues with set_normal_from_faces commit 6a06b247d85145b6bbd8aadd99d80549064410e7 Author: Rohan Rathi <[email protected]> Date: Fri Jul 28 19:54:06 2017 +0530 Added Average and weighting modes to merge. 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: 5a7eeca97cb4ead5ef8f5b4c5d9cec6d233f95f7
Parent Commit: c78d94b
Lines Changed: +2726, -95
1 Added Path:
/source/blender/modifiers/intern/MOD_weighted_normal.c (+645, -0) (View)
28 Modified Paths:
/release/scripts/startup/bl_operators/mesh.py (+0, -50) (Diff)
/release/scripts/startup/bl_ui/properties_data_modifier.py (+16, -0) (Diff)
/release/scripts/startup/bl_ui/space_view3d_toolbar.py (+51, -1) (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 (+361, -6) (Diff)
/source/blender/bmesh/intern/bmesh_mesh.h (+13, -1) (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 (+1190, -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 (+8, -0) (Diff)
/source/blender/editors/mesh/mesh_ops.c (+11, -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 (+3, -0) (Diff)
/source/blender/editors/transform/transform_generics.c (+3, -0) (Diff)
/source/blender/editors/transform/transform_ops.c (+40, -19) (Diff)
/source/blender/makesdna/DNA_modifier_types.h (+24, -0) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+11, -0) (Diff)
/source/blender/makesrna/intern/rna_modifier.c (+62, -0) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+17, -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 (+16, -0) (Diff)
/release/scripts/startup/bl_ui/space_view3d_toolbar.py (+51, -1) (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 (+361, -6) (Diff)
/source/blender/bmesh/intern/bmesh_mesh.h (+13, -1) (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 (+1190, -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 (+8, -0) (Diff)
/source/blender/editors/mesh/mesh_ops.c (+11, -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 (+3, -0) (Diff)
/source/blender/editors/transform/transform_generics.c (+3, -0) (Diff)
/source/blender/editors/transform/transform_ops.c (+40, -19) (Diff)
/source/blender/makesdna/DNA_modifier_types.h (+24, -0) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+11, -0) (Diff)
/source/blender/makesrna/intern/rna_modifier.c (+62, -0) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+17, -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)