[Bf-docboard-svn] bf-manual: [7667] trunk/blender_docs/manual: Merge 2.92 branch

Hans Goudey noreply at blender.org
Mon Jan 25 21:00:31 CET 2021


Revision: 7667
          https://developer.blender.org/rBM7667
Author:   HooglyBoogly
Date:     2021-01-25 21:00:31 +0100 (Mon, 25 Jan 2021)
Log Message:
-----------
Merge 2.92 branch

Modified Paths:
--------------
    trunk/blender_docs/manual/grease_pencil/materials/grease_pencil_shader.rst
    trunk/blender_docs/manual/grease_pencil/modifiers/color/texture_mapping.rst
    trunk/blender_docs/manual/images/grease-pencil_modifiers_color_texture_mapping_panel.png
    trunk/blender_docs/manual/modeling/geometry_nodes/index.rst

Added Paths:
-----------
    trunk/blender_docs/manual/modeling/geometry_nodes/attributes_reference.rst

Property Changed:
----------------
    trunk/blender_docs/

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2021-01-25 19:59:23 UTC (rev 7666)
+++ trunk/blender_docs	2021-01-25 20:00:31 UTC (rev 7667)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/branches/blender-2.92-release/blender_docs:7610-7663
\ No newline at end of property
+/branches/blender-2.92-release/blender_docs:7610-7666
\ No newline at end of property
Modified: trunk/blender_docs/manual/grease_pencil/materials/grease_pencil_shader.rst
===================================================================
--- trunk/blender_docs/manual/grease_pencil/materials/grease_pencil_shader.rst	2021-01-25 19:59:23 UTC (rev 7666)
+++ trunk/blender_docs/manual/grease_pencil/materials/grease_pencil_shader.rst	2021-01-25 20:00:31 UTC (rev 7667)
@@ -93,8 +93,11 @@
       Aligns to the screen space; ignoring the drawing path and the object's rotation.
 
 Rotation
-	Rotates the points of *Dot* and *Square* strokes.
-
+   Rotates the points of *Dot* and *Square* strokes.
+	
+.. note::
+   The rotation parameter is limited to a range of *-90* to *90* degrees.
+   
 Self Overlap
    Disables stencil and overlap self-intersections with alpha materials.
 

Modified: trunk/blender_docs/manual/grease_pencil/modifiers/color/texture_mapping.rst
===================================================================
--- trunk/blender_docs/manual/grease_pencil/modifiers/color/texture_mapping.rst	2021-01-25 19:59:23 UTC (rev 7666)
+++ trunk/blender_docs/manual/grease_pencil/modifiers/color/texture_mapping.rst	2021-01-25 20:00:31 UTC (rev 7667)
@@ -31,7 +31,13 @@
 
       UV Offset
          Moves the texture along the strokes.
-
+		 
+      Rotation
+         Rotates the points of the strokes.
+		 
+      .. note::
+	     The rotation parameter is limited to a range of *-90* to *90* degrees.
+	
       Scale
          Factor for the texture scale.
 

Modified: trunk/blender_docs/manual/images/grease-pencil_modifiers_color_texture_mapping_panel.png
===================================================================
(Binary files differ)

Copied: trunk/blender_docs/manual/modeling/geometry_nodes/attributes_reference.rst (from rev 7666, branches/blender-2.92-release/blender_docs/manual/modeling/geometry_nodes/attributes_reference.rst)
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/attributes_reference.rst	                        (rev 0)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/attributes_reference.rst	2021-01-25 20:00:31 UTC (rev 7667)
@@ -0,0 +1,85 @@
+.. index:: Geometry Nodes; Attribute Reference
+
+**********
+Attributes
+**********
+
+An *attribute* is a generic term to describe data stored per-element in a geometry data-block.
+For example, every vertex can have an associated number or vector value. 
+
+
+Attributes can be adjusted by the nodes in the *Attribute* category, but some other nodes can
+change the values of specific attributes.
+
+.. note::
+
+   The blue attribute sockets are just string sockets, used to look up the list of data stored in the geometry.
+
+.. note::
+
+   Attribute data types are converted implicitly where possible, just like node sockets.
+
+
+Built In Attributes
+===================
+
+.. list-table::
+   :widths: 10 10 50
+   :header-rows: 1
+
+   * - Name
+     - Type
+     - Notes 
+
+   * - **position**
+     - *Vector*
+     - Built in attribute describing vertex or point locations, in the modifier object's
+       transform space. Any node that changes the location of points will adjust this attribute, like the
+       :doc:`Transform </modeling/geometry_nodes/geometry/transform>` and 
+       :doc:`Point Translate </modeling/geometry_nodes/point/point_translate>` nodes.
+
+   * - **radius**
+     - *Float*
+     - Used to set the size for the points created by the
+       :doc:`Point Distribute Node </modeling/geometry_nodes/point/point_distribute>` in the viewport.
+
+
+Naming Conventions
+==================
+
+.. list-table::
+   :widths: 10 10 50
+   :header-rows: 1
+
+   * - Name
+     - Type
+     - Notes
+
+   * - **rotation**
+     - *Vector*
+     - Used in the :doc:`Point Distribute </modeling/geometry_nodes/point/point_distribute>`
+       to control the rotation of instanced objects or collections. This is adjusted by the 
+       :doc:`Point Rotate Node </modeling/geometry_nodes/point/point_rotate>` and the 
+       :doc:`Align Rotation to Vector Node </modeling/geometry_nodes/point/align_rotation_to_vector>`.
+
+   * - **scale**
+     - *Vector*
+     - Used in the :doc:`Point Distribute </modeling/geometry_nodes/point/point_distribute>`
+       to control the scale. This is adjusted by the 
+       :doc:`Point Scale Node </modeling/geometry_nodes/point/point_rotate>` or other attribute nodes.
+
+   * - **id**
+     - *Integer*
+     - Created by the :doc:`Point Distribute </modeling/geometry_nodes/point/point_distribute>`
+       to provide stability when the shape of the input mesh changes. The values are large, with no order.
+       The attribute values are used by nodes that generate randomness, like the 
+       :doc:`Attribute Randomize Node </modeling/geometry_nodes/attribute/attribute_randomize>`.
+
+
+Vertex Groups
+=============
+
+All vertex groups can be used as attributes in the node tree when referred to by name.
+However, the result of the node tree does not always produce vertex groups, if a node like
+:doc:`Join Geometry </modeling/geometry_nodes/geometry/join_geometry>` is used.
+

Modified: trunk/blender_docs/manual/modeling/geometry_nodes/index.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/index.rst	2021-01-25 19:59:23 UTC (rev 7666)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/index.rst	2021-01-25 20:00:31 UTC (rev 7667)
@@ -19,6 +19,7 @@
 .. toctree::
    :maxdepth: 1
 
+   attributes_reference.rst
    attribute/attribute_compare.rst
    attribute/attribute_fill.rst
    attribute/attribute_math.rst



More information about the Bf-docboard-svn mailing list