diff --git a/manual/grease_pencil/modes/edit/tools.rst b/manual/grease_pencil/modes/edit/tools.rst index 79a283cca..ae828224b 100644 --- a/manual/grease_pencil/modes/edit/tools.rst +++ b/manual/grease_pencil/modes/edit/tools.rst @@ -50,9 +50,6 @@ Shear :kbd:`Shift-Ctrl-Alt-S` To Sphere :kbd:`Shift-Alt-S` Move selected points outward in a spherical shape around the selected strokes' center. -Transform Fill - Change the Translation, Rotation and scale of strokes fill. - :ref:`Interpolate ` :kbd:`Ctrl-E` Automatically create a breakdown keyframe between two normal keyframes. diff --git a/manual/grease_pencil/modifiers/introduction.rst b/manual/grease_pencil/modifiers/introduction.rst index 2412b4030..272d5e907 100644 --- a/manual/grease_pencil/modifiers/introduction.rst +++ b/manual/grease_pencil/modifiers/introduction.rst @@ -14,6 +14,8 @@ Modifiers are automatic operations that affect an object in a non-destructive wa With modifiers, you can perform many effects automatically that would otherwise be too tedious to do manually and without affecting the base geometry of your object. +With :doc:`Geometry Nodes `, it is possible to create custom Grease Pencil modifiers. + They work by changing how an object is displayed and rendered, but not the geometry which you can edit directly. You can add several modifiers to a single object forming the modifier stack and *Apply* a modifier if you wish to make its changes permanent. @@ -22,7 +24,7 @@ and *Apply* a modifier if you wish to make its changes permanent. Grease Pencil Modifiers menu. -There are three types of modifiers for Grease Pencil: +There are four types of modifiers for Grease Pencil: Edit These are tools similar to the Deform ones (see below), however, they usually do not directly @@ -36,8 +38,6 @@ Color The *Color* group of modifiers change the object color output. -.. _bpy.ops.object.gpencil_modifier_apply: - Interface ========= diff --git a/manual/grease_pencil/properties/data.rst b/manual/grease_pencil/properties/data.rst index 2baba8aff..c6af16bbe 100644 --- a/manual/grease_pencil/properties/data.rst +++ b/manual/grease_pencil/properties/data.rst @@ -17,6 +17,7 @@ Grease Pencil Strokes can be grouped in 2D layers, a special Grease Pencil layers that help to organize the drawing order and visibility of the strokes. +Layers can be organized into layer groups. :doc:`Onion Skinning ` @@ -37,11 +38,19 @@ General settings for Grease Pencil strokes. Attributes ========== -An attribute is data stored per curve element. Every attribute has a data type, domain and name. -This panel only lists custom attributes which excludes all the built-in attributes like ``position`` and -other attributes like vertex groups. +Layers can store :doc:`Custom Attributes `. +The attributes are stored on the :ref:`Layer ` domain. -See :doc:`Attributes Reference ` for more information. +For example, the :ref:`Layer Adjustments ` are stored as layer attributes. + +Attributes + :ref:`List view ` of all the attributes stored on the layers. + + Name + Name of the layer attribute. + + Data Type + The :ref:`Data Type ` of the attribute. :doc:`Vertex Groups ` @@ -64,3 +73,4 @@ Create and manage your own properties to store data in the Grease Pencil's data- layers.rst onion_skinning.rst strokes.rst + diff --git a/manual/grease_pencil/properties/layers.rst b/manual/grease_pencil/properties/layers.rst index a75580ed7..12a7eac1f 100644 --- a/manual/grease_pencil/properties/layers.rst +++ b/manual/grease_pencil/properties/layers.rst @@ -15,13 +15,18 @@ Layers Grease Pencil Layers panel. -Grease Pencil objects can be organized into a tree known as layers for grouping and arranging strokes. +Grease Pencil objects can be organized into a tree known as the layer tree for grouping and arranging strokes. Any stroke can only belong to a single 2D layer. -There is always only one active layer in the list (the selected one). +The selected layer is the active layer. Only one layer or group can be active at a time. When you draw, the new strokes are added to the active layer. By default the view order of the layers in the viewport is top to bottom. +Layers can be grouped using Layer Groups. +A layer can only be in one group at a time. +Layers can be moved into groups using drag-and-drop. +Groups can be color coded with a color tag. + Every layer correspond to a channel in the Dope Sheet editor (in Grease Pencil mode). See :doc:`Dope Sheet ` for more information. @@ -48,8 +53,8 @@ the layer becomes prepared to be masked by other layer(s). Activate *Fade Inactive Layers* in overlays to control the opacity of the non-active layers. See :doc:`Overlays ` for more information. -Layers List - :ref:`List view ` of all layers for the Grease Pencil object. +Layer Tree + Tree view of all layers and groups for the Grease Pencil object. Next to the layer name there are four icons buttons that control common properties of the layer: @@ -113,7 +118,7 @@ Layer Specials Merge Down Combine the selected layer with the layer below, the new layer keeps the name of the lower layer. Merge Group - Combine layers in the active group into a single layer. + Combine layers in the active layer group into a single layer. Merge All Combine all layers into the active layer. @@ -123,13 +128,13 @@ Layer Specials Copy All Layers to Selected Copy all layers to the selected Grease Pencil object. -.. .. _bpy.ops.gpencil.layer_isolate: +.. _bpy.ops.grease_pencil.layer_isolate: -.. Visibility (screen icon) -.. Toggle whether the active layer is the only one that can be edited and is visible. +Visibility (screen icon) + Toggle whether the active layer is the only one that can be edited and is visible. -.. Isolate Lock (padlock icon) -.. Toggle whether the active layer is the only one that can be edited. +Isolate Lock (padlock icon) + Toggle whether the active layer is the only one that can be edited. Below the layers list there are additional settings: @@ -201,6 +206,8 @@ Transform Allows per-layer location, rotation and scale transformations. +.. _layer-adjustments: + Adjustments =========== diff --git a/manual/grease_pencil/properties/onion_skinning.rst b/manual/grease_pencil/properties/onion_skinning.rst index bb242a395..619f2e964 100644 --- a/manual/grease_pencil/properties/onion_skinning.rst +++ b/manual/grease_pencil/properties/onion_skinning.rst @@ -19,25 +19,25 @@ See :doc:`2D Layers ` for more information. Options ======= -.. _bpy.types.GreasePencil.onion_mode: +.. _bpy.types.GreasePencilv3.onion_mode: Mode :Keyframes: Shows Keyframes in the range determined by the *Before*/*After* settings. :Frames: Shows Frames in the range determined by the *Before*/*After* settings. :Selected: Shows only on the manually selected keyframes in the Dope Sheet. -.. _bpy.types.GreasePencil.onion_factor: +.. _bpy.types.GreasePencilv3.onion_factor: Opacity Control the opacity of the ghost frames. -.. _bpy.types.GreasePencil.onion_keyframe_type: +.. _bpy.types.GreasePencilv3.onion_keyframe_type: Filter by Type Filters what type of frames to show in the Onion Skinning range. -.. _bpy.types.GreasePencil.ghost_before_range: -.. _bpy.types.GreasePencil.ghost_after_range: +.. _bpy.types.GreasePencilv3.ghost_before_range: +.. _bpy.types.GreasePencilv3.ghost_after_range: Keyframes Before/After Sets how many frames or keyframes, depending on the *Mode*, to show before and after the current frame. @@ -46,8 +46,8 @@ Keyframes Before/After Custom Colors ============= -.. _bpy.types.GreasePencil.before_color: -.. _bpy.types.GreasePencil.after_color: +.. _bpy.types.GreasePencilv3.before_color: +.. _bpy.types.GreasePencilv3.after_color: Before/After Color to use before and after the current frame on ghost frames. @@ -56,17 +56,12 @@ Before/After Display ======= -.. _bpy.types.GreasePencil.use_ghosts_always: - -View in Render - Show the onion skinning in final render image e.g. for a motion blur effect. - -.. _bpy.types.GreasePencil.use_onion_fade: +.. _bpy.types.GreasePencilv3.use_onion_fade: Fade Opacity of the ghosts frames decrease the further away from the current frame. -.. _bpy.types.GreasePencil.use_onion_loop: +.. _bpy.types.GreasePencilv3.use_onion_loop: Show Start Frame Help working on loop animations showing the first keyframe/frame diff --git a/manual/modeling/geometry_nodes/attributes_reference.rst b/manual/modeling/geometry_nodes/attributes_reference.rst index 6f89c1264..f787cc5ba 100644 --- a/manual/modeling/geometry_nodes/attributes_reference.rst +++ b/manual/modeling/geometry_nodes/attributes_reference.rst @@ -128,6 +128,7 @@ to determine the domains of attributes. - **Instance** domain attributes exist on the :doc:`/modeling/geometry_nodes/instances` in a geometry. They can be used to store different values on copies of geometry data. Instance domain attributes are only supported in geometry nodes. +- **Layer** domain attributes are associated with a :doc:`Grease Pencil Layer `. Attributes are automatically interpolated to other domains. For example, when the :doc:`/modeling/geometry_nodes/geometry/read/position` is connected to the selection input of