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
2021-08-22Merge branch 'master' into soc-2021-porting-modifiers-to-nodes_allsoc-2021-porting-modifiers-to-nodes_allFabian Schempp
2021-08-20Functions: remove multi-function networkJacques Lucke
The multi-function network system was able to compose multiple multi-functions into a new one and to evaluate that efficiently. This functionality was heavily used by the particle nodes prototype a year ago. However, since then we only used multi-functions without the need to compose them in geometry nodes. The upcoming "fields" in geometry nodes will need a way to compose multi-functions again. Unfortunately, the code removed in this commit was not ideal for this different kind of function composition. I've been working on an alternative that will be added separately when it becomes needed. I've had to update all the function nodes, because their interface depended on the multi-function network data structure a bit. The actual multi-function implementations are still the same though.
2021-08-19SOC2021 Porting Modifiers To nodes allFabian Schempp
This branch merges all branches from soc2021 porting modifiers to nodes into one. The branche is mainly used to make a testbuild.
2021-08-17Merge branch 'soc-2021-porting-modifiers-to-nodes-solidify' into ↵Fabian Schempp
soc-2021-porting-modifiers-to-nodes # Conflicts: # release/scripts/startup/nodeitems_builtins.py # source/blender/blenkernel/BKE_node.h # source/blender/geometry/CMakeLists.txt # source/blender/makesrna/RNA_enum_types.h # source/blender/modifiers/CMakeLists.txt # source/blender/nodes/NOD_static_types.h
2021-08-17Merge branch 'soc-2021-porting-modifiers-to-nodes-remesh-voxel' into ↵Fabian Schempp
soc-2021-porting-modifiers-to-nodes # Conflicts: # release/scripts/startup/nodeitems_builtins.py # source/blender/blenkernel/BKE_node.h # source/blender/blenkernel/intern/node.cc # source/blender/nodes/CMakeLists.txt # source/blender/nodes/NOD_geometry.h # source/blender/nodes/NOD_static_types.h # source/blender/nodes/geometry/nodes/node_geo_remesh_voxel.cc
2021-08-17Merge branch 'soc-2021-porting-modifiers-to-nodes-remesh-blocks' into ↵Fabian Schempp
soc-2021-porting-modifiers-to-nodes # Conflicts: # release/scripts/startup/nodeitems_builtins.py # source/blender/blenkernel/BKE_node.h # source/blender/geometry/CMakeLists.txt # source/blender/makesrna/intern/rna_nodetree.c
2021-08-17Merge branch 'soc-2021-porting-modifiers-to-nodes-merge-by-distance' into ↵Fabian Schempp
soc-2021-porting-modifiers-to-nodes # Conflicts: # source/blender/blenkernel/BKE_node.h # source/blender/makesrna/RNA_enum_types.h
2021-08-17Merge branch 'soc-2021-porting-modifiers-to-nodes-extrude-and-move' into ↵Fabian Schempp
soc-2021-porting-modifiers-to-nodes # Conflicts: # release/scripts/startup/nodeitems_builtins.py # source/blender/blenkernel/BKE_node.h
2021-08-17Merge branch 'soc-2021-porting-modifiers-to-nodes-extrude' into ↵Fabian Schempp
soc-2021-porting-modifiers-to-nodes # Conflicts: # release/scripts/startup/nodeitems_builtins.py # source/blender/blenkernel/BKE_node.h # source/blender/bmesh/intern/bmesh_mesh.c # source/blender/bmesh/intern/bmesh_mesh.h
2021-08-16Geometry Nodes: Mesh ExtrudeFabian Schempp
Node that extrudes vertices, edges and Faces. Uses the corresponding bmesh operator. I renamed D12108, which was previously named Mesh Extrude to Mesh Inset, because that uses the bmesh inset operators. NOTE: This requires an update of the attribute interpolation to work, that is not yet in master. Part of the GSOC 2021 Differential Revision: https://developer.blender.org/D12224
2021-08-15Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-extrude-and-moveFabian Schempp
# Conflicts: # source/blender/blenkernel/BKE_node.h
2021-08-15Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-remesh-blocksFabian Schempp
# Conflicts: # source/blender/blenkernel/BKE_node.h # source/blender/modifiers/CMakeLists.txt
2021-08-14Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-remesh-voxelFabian Schempp
# Conflicts: # source/blender/blenkernel/BKE_node.h
2021-08-14Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-decimateFabian Schempp
# Conflicts: # source/blender/blenkernel/BKE_node.h
2021-08-14Changes based on review by Hans Goudey (HooglyBoogly)Fabian Schempp
2021-08-12Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-merge-by-distanceFabian Schempp
# Conflicts: # source/blender/blenkernel/BKE_node.h # source/blender/editors/asset/ED_asset_temp_id_consumer.h
2021-08-06Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-solidifyFabian Schempp
# Conflicts: # source/blender/blenkernel/BKE_node.h # source/blender/geometry/intern/solidify_nonmanifold.c # source/blender/nodes/NOD_static_types.h
2021-08-06Merged MasterFabian Schempp
2021-08-06Geometry Nodes: Select by Handle Type NodeHans Goudey
Just like the "Select by Material" node, this node outputs a boolean attribute for control points that have a matching handle type. By default left and right handles are considered, but it's possible to only check one side with the toggle in the node. Differential Revision: https://developer.blender.org/D12135
2021-08-04Geometry Nodes: Curve Set Spline TypeJohnny Matthews
This node sets the selected (or all) splines in curve to a chosen target spline type. Poly, Bezier, and NURB splines can be converted to any of the other types. This is meant to be a building block node, useful in many procedural situations. In the future the node could be optimized with multi-threading, or by avoiding copying in many cases, either by retrieving the curve for write access or by passing the raw vectors to the new splines where possible. With edits from Hans Goudey (@HooglyBoogly) Differential Revision: https://developer.blender.org/D12013
2021-08-03Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-extrudeFabian Schempp
2021-08-02Geometry Nodes: ExtrudeFabian Schempp
Differential Revision: https://developer.blender.org/D12108
2021-08-02Cleanup: separate base and geometry nodes specific socket cpp typeJacques Lucke
This simplifies changing how geometry nodes handles different socket types without affecting other systems.
2021-07-31Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-remesh-voxelFabian Schempp
# Conflicts: # source/blender/blenkernel/BKE_node.h
2021-07-30Geometry Nodes: Set Bezier Handle Type NodeJohnny Matthews
This node takes a curve and a point selection and allows you to set the specified (or all) points left/right or both handles to a given type. Differential Revision: https://developer.blender.org/D11992
2021-07-30Geometry Nodes: Curve Trim NodeAngus Stanton
This node implements shortening each spline in the curve based on either a length from the start of each spline, or a factor of the total length of each spline, similar to the "Start & End Mapping" panel of curve properties. For Bezier curves, the first and last control points are adjusted to maintain the shape of the curve, but NURB splines are currently implicitly converted to poly splines. The node is implemented to avoid copying where possible, so it outputs a changed version of the input curve rather than a new one. Differential Revision: https://developer.blender.org/D11901
2021-07-30Fix T49944: Compositor ID Mask Anti-Aliasing not workingAidan Haile
Replaces current ID Mask node Anti-Aliasing operation by SMAA operations with default settings as proposed by Jeroen Bakker. SMAA produces smoother edges. Reviewed By: manzanilla Differential Revision: https://developer.blender.org/D11881
2021-07-23Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-remesh-blocksFabian Schempp
# Conflicts: # source/blender/blenkernel/BKE_node.h
2021-07-23Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-merge-by-distanceFabian Schempp
# Conflicts: # source/blender/blenkernel/BKE_node.h
2021-07-23initial commitFabian Schempp
2021-07-22Geometry Nodes: Set Bezier Handle Type NodeJohnny Matthews
This node takes a curve and a point selection and allows you to set the specified (or all) points left/right or both handles to a given type. Differential Revision: https://developer.blender.org/D11992
2021-07-20initial commitFabian Schempp
2021-07-18Geometry Nodes: Curve Trim NodeAngus Stanton
This node implements shortening each spline in the curve based on either a length from the start of each spline, or a factor of the total length of each spline, similar to the "Start & End Mapping" panel of curve properties. For Bezier curves, the first and last control points are adjusted to maintain the shape of the curve, but NURB splines are currently implicitly converted to poly splines. The node is implemented to avoid copying where possible, so it outputs a changed version of the input curve rather than a new one. Differential Revision: https://developer.blender.org/D11901
2021-07-17Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-remesh-blocksFabian Schempp
2021-07-16Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-remesh-voxelFabian Schempp
2021-07-15Fix T49944: Compositor ID Mask Anti-Aliasing not workingAidan Haile
Replaces current ID Mask node Anti-Aliasing operation by SMAA operations with default settings as proposed by Jeroen Bakker. SMAA produces smoother edges. Reviewed By: manzanilla Differential Revision: https://developer.blender.org/D11881
2021-07-15Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-solidifyFabian Schempp
# Conflicts: # release/scripts/startup/nodeitems_builtins.py # source/blender/blenkernel/BKE_node.h # source/blender/blenkernel/intern/node.cc # source/blender/blenkernel/intern/solidify_nonmanifold.c # source/blender/nodes/CMakeLists.txt # source/blender/nodes/NOD_geometry.h # source/blender/nodes/NOD_static_types.h
2021-07-14Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-decimateFabian Schempp
# Conflicts: # source/blender/blenkernel/BKE_node.h
2021-07-14Geometry Nodes: Remesh BlocksFabian Schempp
This patch adds a Remesh Voxel node (compared to Remesh Blocks) The node uses the BKE function for voxel remeshing used in the modifier as well. Part of the GSOC 2021 Differential Revision: https://developer.blender.org/D11907
2021-07-13Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-remesh-blocksFabian Schempp
# Conflicts: # source/blender/blenkernel/BKE_node.h
2021-07-13- Renamed Remesh to Remesh Block.Fabian Schempp
- Moved Dualcon Remesh to BKE - Used new BKE_mesh_remesh_blocks in modifier and node.
2021-07-12Geometry Nodes: Curve Primitive QuadrilateralJohnny Matthews
This commit adds a curve primitive node for creating squares, rectangles, trapezoids, kites, and parallelograms. It also includes a mode where the four points are just vector inputs. Differential Revision: https://developer.blender.org/D11665
2021-07-10Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-remeshFabian Schempp
# Conflicts: # release/scripts/startup/nodeitems_builtins.py # source/blender/blenkernel/BKE_node.h
2021-07-09Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-decimateFabian Schempp
# Conflicts: # release/scripts/startup/nodeitems_builtins.py # source/blender/blenkernel/BKE_node.h # source/blender/blenkernel/intern/node.cc
2021-07-07Geometry Nodes: Rename nodes for clarity between mesh and curveHans Goudey
Rename the mesh circle to "Mesh Circle", mesh line to "Mesh Line", and mesh subdivide to "Mesh Subdivide". Previously they looked exactly the same in the search menu, and the nodes themselves had the same label. This is a "deep" rename that also renames internal defines and function names to match the UI.
2021-07-07Geometry Nodes: Curve Endpoints NodeAngus Stanton
This node is quite similar to the curve to points node, but creates points for only the start and end of each spline. This is a separate node because the sampling from the curve to points node don't apply, and just for ease of use. All attributes from the curves are copied, including the data for instancing: tangents, normals, and the derived rotations. One simple use case is to make round caps on curves by instancinghalves of a sphere on each end of the splines. Differential Revision: https://developer.blender.org/D11719
2021-07-06Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-decimateFabian Schempp
# Conflicts: # source/blender/blenkernel/BKE_node.h # source/blender/blenkernel/intern/node.cc # source/blender/nodes/CMakeLists.txt # source/blender/nodes/NOD_geometry.h # source/blender/nodes/NOD_static_types.h
2021-07-06cleanupFabian Schempp
2021-07-06Nodes: Adds button to groups to change type of sockets.Lukas Tönne
The menu lists all socket types that are valid for the node tree. Changing a socket type updates all instances of the group and keeps existing links to the socket. If changing the socket type leads to incorrect node connections the links are flagged as invalid (red) and ignored but not removed. This is so users don't lose information and can then fix resulting issues. For example: Changing a Color socket to a Shader socket can cause an invalid Shader-to-Color connection. Implementation details: The new `NODE_OT_tree_socket_change_type` operator uses the generic `rna_node_socket_type_itemf` function to list all eligible socket types. It uses the tree type's `valid_socket_type` callback to test for valid types. In addition it also checks the subtype, because multiple RNA types are registered for the same base type. The `valid_socket_type` callback has been modified slightly to accept full socket types instead of just the base type enum, so that custom (python) socket types can be used by this operator. The `nodeModifySocketType` function is now called when group nodes encounter a socket type mismatch, instead of replacing the socket entirely. This ensures that links are kept to/from group nodes as well as group input/output nodes. The `nodeModifySocketType` function now also takes a full `bNodeSocketType` instead of just the base and subtype enum (a shortcut `nodeModifySocketTypeStatic` exists for when only static types are used). Differential Revision: https://developer.blender.org/D10912
2021-07-05Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-remeshFabian Schempp
# Conflicts: # source/blender/blenkernel/BKE_node.h # source/blender/nodes/NOD_geometry.h