blender
/
blender
135
420
Fork 603
Code Issues 6.3k Pull Requests 757 Projects 19 Wiki Activity

WIP: Volume grid attribute support in geometry nodes #110044

Closed
Lukas Tönne wants to merge 130 commits from LukasTonne/blender:geometry-nodes-flip into main
pull from: LukasTonne/blender:geometry-nodes-flip
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 7 Commits 130 Files Changed 80 +8 -2
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 501d7d4f50 - Show all commits

8
scripts/startup/bl_ui/node_add_menu_geometry.py
View File

@ -615,11 +615,17 @@ class NODE_MT_category_GEO_VOLUME(Menu):
node_add_menu.add_node_type(layout, "GeometryNodeVolumeToMesh")
if context.preferences.experimental.use_new_volume_nodes:
layout.separator()
node_add_menu.add_node_type(layout, "GeometryNodeVolumeInfo")
node_add_menu.add_node_type(layout, "GeometryNodeInputVolumeCoordinate")
node_add_menu.add_node_type(layout, "GeometryNodeInputVolumeValue")
node_add_menu.add_node_type(layout, "GeometryNodeSampleVolume")
node_add_menu.add_node_type(layout, "GeometryNodeMeanFilterSDFVolume")
node_add_menu.add_node_type(layout, "GeometryNodeOffsetSDFVolume")
node_add_menu.add_node_type(layout, "GeometryNodeSampleVolume")
node_add_menu.add_node_type(layout, "GeometryNodeSDFVolumeSphere")
node_add_menu.add_node_type(layout, "GeometryNodeInputSignedDistance")
node_add_menu.add_node_type(layout, "GeometryNodeVolumeDivergence")
node_add_menu.add_node_type(layout, "GeometryNodeVolumeGradient")
node_add_menu.add_node_type(layout, "GeometryNodeVolumeSolvePoisson")
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)

2
source/blender/nodes/NOD_static_types.h
View File

@ -356,7 +356,7 @@ DefNode(GeometryNode, GEO_NODE_INPUT_SPLINE_CYCLIC, 0, "INPUT_SPLINE_CYCLIC",Inp
DefNode(GeometryNode, GEO_NODE_INPUT_SPLINE_LENGTH, 0, "SPLINE_LENGTH", SplineLength, "Spline Length", "Retrieve the total length of each spline, as a distance or as a number of points")
DefNode(GeometryNode, GEO_NODE_INPUT_SPLINE_RESOLUTION, 0, "INPUT_SPLINE_RESOLUTION", InputSplineResolution, "Spline Resolution", "Retrieve the number of evaluated points that will be generated for every control point on curves")
DefNode(GeometryNode, GEO_NODE_INPUT_TANGENT, 0, "INPUT_TANGENT", InputTangent, "Curve Tangent", "Retrieve the direction of curves at each control point")
DefNode(GeometryNode, GEO_NODE_INPUT_VOLUME_COORDINATE, 0, "INPUT_VOLUME_COORDINATES", InputVolumeCoordinates, "Volume Coordinates", "Grid coordinates of the active voxels of a volume")
DefNode(GeometryNode, GEO_NODE_INPUT_VOLUME_COORDINATE, 0, "INPUT_VOLUME_COORDINATE", InputVolumeCoordinate, "Volume Coordinate", "Grid coordinate of the active voxels of a volume")
DefNode(GeometryNode, GEO_NODE_INPUT_VOLUME_VALUE, def_geo_volume_value, "INPUT_VOLUME_VALUE", InputVolumeValue, "Volume Value", "Value stored in the active voxels of a volume")
DefNode(GeometryNode, GEO_NODE_INSTANCE_ON_POINTS, 0, "INSTANCE_ON_POINTS", InstanceOnPoints, "Instance on Points", "Generate a reference to geometry at each of the input points, without duplicating its underlying data")
DefNode(GeometryNode, GEO_NODE_INSTANCES_TO_POINTS, 0, "INSTANCES_TO_POINTS",InstancesToPoints, "Instances to Points", "Generate points at the origins of instances.\nNote: Nested instances are not affected by this node")