[Bf-docboard-svn] bf-manual: [7687] trunk/blender_docs/manual/modeling/geometry_nodes: Merge branch 'blender-2.92-release'
Aaron Carlisle
noreply at blender.org
Fri Jan 29 05:37:50 CET 2021
Revision: 7687
https://developer.blender.org/rBM7687
Author: Blendify
Date: 2021-01-29 05:37:50 +0100 (Fri, 29 Jan 2021)
Log Message:
-----------
Merge branch 'blender-2.92-release'
Modified Paths:
--------------
trunk/blender_docs/manual/modeling/geometry_nodes/index.rst
Added Paths:
-----------
trunk/blender_docs/manual/modeling/geometry_nodes/attribute/index.rst
trunk/blender_docs/manual/modeling/geometry_nodes/color/index.rst
trunk/blender_docs/manual/modeling/geometry_nodes/geometry/index.rst
trunk/blender_docs/manual/modeling/geometry_nodes/input/index.rst
trunk/blender_docs/manual/modeling/geometry_nodes/introduction.rst
trunk/blender_docs/manual/modeling/geometry_nodes/mesh/index.rst
trunk/blender_docs/manual/modeling/geometry_nodes/point/index.rst
trunk/blender_docs/manual/modeling/geometry_nodes/utilities/index.rst
trunk/blender_docs/manual/modeling/geometry_nodes/vector/index.rst
Property Changed:
----------------
trunk/blender_docs/
Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs 2021-01-29 04:29:11 UTC (rev 7686)
+++ trunk/blender_docs 2021-01-29 04:37:50 UTC (rev 7687)
Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/branches/blender-2.92-release/blender_docs:7610-7682
\ No newline at end of property
+/branches/blender-2.92-release/blender_docs:7610-7686
\ No newline at end of property
Copied: trunk/blender_docs/manual/modeling/geometry_nodes/attribute/index.rst (from rev 7686, branches/blender-2.92-release/blender_docs/manual/modeling/geometry_nodes/attribute/index.rst)
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/attribute/index.rst (rev 0)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/attribute/index.rst 2021-01-29 04:37:50 UTC (rev 7687)
@@ -0,0 +1,16 @@
+
+###################
+ Attribute Nodes
+###################
+
+.. toctree::
+ :maxdepth: 1
+
+ attribute_compare.rst
+ attribute_fill.rst
+ attribute_math.rst
+ attribute_mix.rst
+ attribute_vector_math.rst
+ attribute_randomize.rst
+ attribute_sample_texture.rst
+ attribute_color_ramp.rst
Copied: trunk/blender_docs/manual/modeling/geometry_nodes/color/index.rst (from rev 7686, branches/blender-2.92-release/blender_docs/manual/modeling/geometry_nodes/color/index.rst)
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/color/index.rst (rev 0)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/color/index.rst 2021-01-29 04:37:50 UTC (rev 7687)
@@ -0,0 +1,11 @@
+
+###############
+ Color Nodes
+###############
+
+.. toctree::
+ :maxdepth: 1
+
+ color_ramp.rst
+ combine_rgb.rst
+ separate_rgb.rst
Copied: trunk/blender_docs/manual/modeling/geometry_nodes/geometry/index.rst (from rev 7686, branches/blender-2.92-release/blender_docs/manual/modeling/geometry_nodes/geometry/index.rst)
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/geometry/index.rst (rev 0)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/geometry/index.rst 2021-01-29 04:37:50 UTC (rev 7687)
@@ -0,0 +1,10 @@
+
+##################
+ Geometry Nodes
+##################
+
+.. toctree::
+ :maxdepth: 1
+
+ join_geometry.rst
+ transform.rst
Modified: trunk/blender_docs/manual/modeling/geometry_nodes/index.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/index.rst 2021-01-29 04:29:11 UTC (rev 7686)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/index.rst 2021-01-29 04:37:50 UTC (rev 7687)
@@ -6,116 +6,25 @@
Geometry Nodes
##################
-Nodes can be used to change an object's geometry in a more complex way than regular modifiers.
-To use them add a :doc:`Geometry Nodes Modifier </modeling/modifiers/generate/geometry_nodes>`.
-
-.. figure:: /images/modeling_modifiers_nodes_properties.png
-
- The properties of a Geometry Nodes modifier in the modifier stack.
-
-
-Attribute
-=========
-
.. toctree::
- :maxdepth: 1
+ :maxdepth: 2
+ introduction.rst
attributes_reference.rst
- attribute/attribute_compare.rst
- attribute/attribute_fill.rst
- attribute/attribute_math.rst
- attribute/attribute_mix.rst
- attribute/attribute_vector_math.rst
- attribute/attribute_randomize.rst
- attribute/attribute_color_ramp.rst
- attribute/attribute_sample_texture.rst
-Color
-=====
+Node Types
+==========
.. toctree::
- :maxdepth: 1
+ :maxdepth: 2
- color/color_ramp.rst
- color/combine_rgb.rst
- color/separate_rgb.rst
-
-
-Geometry
-========
-
-Nodes that can operate on different geometry types (volume, mesh).
-
-.. toctree::
- :maxdepth: 1
-
- geometry/join_geometry.rst
- geometry/transform.rst
-
-
-Input
-=====
-
-Nodes used mainly as input to other nodes.
-
-.. toctree::
- :maxdepth: 1
-
- input/object_info.rst
- input/random_float.rst
- input/value.rst
- input/vector.rst
-
-
-Mesh
-====
-
-Nodes that only operate on meshes.
-
-.. toctree::
- :maxdepth: 1
-
- mesh/boolean.rst
- mesh/edge_split.rst
- mesh/subdivision_surface.rst
- mesh/triangulate.rst
-
-
-Point
-=====
-
-.. toctree::
- :maxdepth: 1
-
- point/align_rotation_to_vector.rst
- point/point_distribute.rst
- point/point_instance.rst
- point/point_rotate.rst
- point/point_scale.rst
- point/point_separate.rst
- point/point_translate.rst
-
-
-Utilities
-=========
-
-.. toctree::
- :maxdepth: 1
-
- utilities/boolean_math.rst
- utilities/clamp.rst
- utilities/float_compare.rst
- utilities/map_range.rst
- utilities/math.rst
-
-
-Vector
-======
-
-.. toctree::
- :maxdepth: 1
-
- vector/combine_xyz.rst
- vector/separate_xyz.rst
- vector/vector_math.rst
+ attribute/index.rst
+ color/index.rst
+ geometry/index.rst
+ input/index.rst
+ mesh/index.rst
+ point/index.rst
+ utilities/index.rst
+ vector/index.rst
+ group.rst
Copied: trunk/blender_docs/manual/modeling/geometry_nodes/input/index.rst (from rev 7686, branches/blender-2.92-release/blender_docs/manual/modeling/geometry_nodes/input/index.rst)
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/input/index.rst (rev 0)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/input/index.rst 2021-01-29 04:37:50 UTC (rev 7687)
@@ -0,0 +1,12 @@
+
+###############
+ Input Nodes
+###############
+
+.. toctree::
+ :maxdepth: 1
+
+ object_info.rst
+ random_float.rst
+ value.rst
+ vector.rst
Copied: trunk/blender_docs/manual/modeling/geometry_nodes/introduction.rst (from rev 7686, branches/blender-2.92-release/blender_docs/manual/modeling/geometry_nodes/introduction.rst)
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/introduction.rst (rev 0)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/introduction.rst 2021-01-29 04:37:50 UTC (rev 7687)
@@ -0,0 +1,32 @@
+
+************
+Introduction
+************
+
+Nodes can be used to change an object's geometry in a more complex way than regular modifiers.
+To use them add a :doc:`Geometry Nodes Modifier </modeling/modifiers/generate/geometry_nodes>`.
+
+.. figure:: /images/modeling_modifiers_nodes_properties.png
+
+ The properties of a Geometry Nodes modifier in the modifier stack.
+
+
+Node Categories
+===============
+
+Attribute
+ Nodes for working with data stored per object element, e.g. vertex groups.
+Color
+ Nodes for modifying color data passed through color sockets.
+Geometry
+ Nodes that can operate on different geometry types (volume, mesh).
+Input
+ Nodes used mainly as input to other nodes.
+Mesh
+ Nodes that only operate on meshes.
+Point
+ Nodes that modify the object elements, e.g. vertices.
+Utilities
+ Nodes with general purpose for modifying data.
+Vector
+ Nodes for modifying vector quantities.
Copied: trunk/blender_docs/manual/modeling/geometry_nodes/mesh/index.rst (from rev 7686, branches/blender-2.92-release/blender_docs/manual/modeling/geometry_nodes/mesh/index.rst)
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/mesh/index.rst (rev 0)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/mesh/index.rst 2021-01-29 04:37:50 UTC (rev 7687)
@@ -0,0 +1,12 @@
+
+##############
+ Mesh Nodes
+##############
+
+.. toctree::
+ :maxdepth: 1
+
+ boolean.rst
+ edge_split.rst
+ subdivision_surface.rst
+ triangulate.rst
Copied: trunk/blender_docs/manual/modeling/geometry_nodes/point/index.rst (from rev 7686, branches/blender-2.92-release/blender_docs/manual/modeling/geometry_nodes/point/index.rst)
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/point/index.rst (rev 0)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/point/index.rst 2021-01-29 04:37:50 UTC (rev 7687)
@@ -0,0 +1,15 @@
+
+###############
+ Point Nodes
+###############
+
+.. toctree::
+ :maxdepth: 1
+
+ align_rotation_to_vector.rst
+ point_distribute.rst
+ point_instance.rst
+ point_rotate.rst
+ point_scale.rst
+ point_separate.rst
+ point_translate.rst
Copied: trunk/blender_docs/manual/modeling/geometry_nodes/utilities/index.rst (from rev 7686, branches/blender-2.92-release/blender_docs/manual/modeling/geometry_nodes/utilities/index.rst)
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/utilities/index.rst (rev 0)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/utilities/index.rst 2021-01-29 04:37:50 UTC (rev 7687)
@@ -0,0 +1,13 @@
+
+###################
+ Utilities Nodes
+###################
+
+.. toctree::
+ :maxdepth: 1
+
+ boolean_math.rst
+ clamp.rst
+ float_compare.rst
+ map_range.rst
+ math.rst
Copied: trunk/blender_docs/manual/modeling/geometry_nodes/vector/index.rst (from rev 7686, branches/blender-2.92-release/blender_docs/manual/modeling/geometry_nodes/vector/index.rst)
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/vector/index.rst (rev 0)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/vector/index.rst 2021-01-29 04:37:50 UTC (rev 7687)
@@ -0,0 +1,11 @@
+
+################
+ Vector Nodes
+################
+
+.. toctree::
+ :maxdepth: 1
+
+ combine_xyz.rst
+ separate_xyz.rst
+ vector_math.rst
More information about the Bf-docboard-svn
mailing list