From 21530f8ccda33ce394a6ccaa94c0fc5abd9f6a47 Mon Sep 17 00:00:00 2001 From: Falk David Date: Tue, 8 Oct 2024 14:40:46 +0200 Subject: [PATCH 01/11] Update Onion Skinning page --- .../properties/onion_skinning.rst | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) 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 -- 2.30.2 From 18bda448461b4e711ca44b17d5b5cd4e162c0d7e Mon Sep 17 00:00:00 2001 From: Falk David Date: Tue, 8 Oct 2024 14:45:48 +0200 Subject: [PATCH 02/11] Update Layers page --- manual/grease_pencil/properties/layers.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/manual/grease_pencil/properties/layers.rst b/manual/grease_pencil/properties/layers.rst index a75580ed7..f9eedffca 100644 --- a/manual/grease_pencil/properties/layers.rst +++ b/manual/grease_pencil/properties/layers.rst @@ -15,10 +15,10 @@ 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. @@ -48,8 +48,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 + :ref:`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: @@ -123,13 +123,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: -- 2.30.2 From b5fcf08cde414f93a8438497e4b52f8c942192a3 Mon Sep 17 00:00:00 2001 From: Falk David Date: Tue, 8 Oct 2024 14:54:55 +0200 Subject: [PATCH 03/11] Add page for Layer Groups --- manual/grease_pencil/properties/data.rst | 6 +++ .../grease_pencil/properties/layer_groups.rst | 46 +++++++++++++++++++ manual/grease_pencil/properties/layers.rst | 4 +- 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 manual/grease_pencil/properties/layer_groups.rst diff --git a/manual/grease_pencil/properties/data.rst b/manual/grease_pencil/properties/data.rst index 0616cc968..c897d36fc 100644 --- a/manual/grease_pencil/properties/data.rst +++ b/manual/grease_pencil/properties/data.rst @@ -18,6 +18,12 @@ 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. +:doc:`Layer Groups ` +================================================ + +Layers can be organized into layer groups. This helps to get a better overview +when a file contains a lot of layers. Groups can be hidden and locked just like +layers. :doc:`Onion Skinning ` ================================================================ diff --git a/manual/grease_pencil/properties/layer_groups.rst b/manual/grease_pencil/properties/layer_groups.rst new file mode 100644 index 000000000..02ea28bca --- /dev/null +++ b/manual/grease_pencil/properties/layer_groups.rst @@ -0,0 +1,46 @@ +.. _bpy.types.GreasePencilLayerGroup + +************ +Layer Groups +************ + +.. reference:: + + :Mode: All Modes + :Panel: :menuselection:`Object Data tab --> Layers` + :Shortcut: :kbd:`Y` + +.. figure:: /images/grease-pencil_properties_layers_panel.png + :align: right + + Grease Pencil Layers panel. + +The :doc:`Layers ` in a Grease Pencil objects can be +grouped into a Layer Group. + +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. + +Layer Tree + :ref:`Tree view ` of all layers and groups for the Grease Pencil object. + + Next to the group name there are four icons buttons that control common properties of the group: + + Use Mask (mask icon) + Toggle the affect of :ref:`Masks ` on all the layers inside the group. + + .. _bpy.types.GreasePencilLayerGroup.use_onion_skinning: + + Onion Skinning (onion skin icon) + Toggle using the layers inside the group for :doc:`Onion Skinning `. + + .. _bpy.types.GreasePencilLayerGroup.hide: + + Hide (eye icon) + Toggle all the layer visibility of this group in the viewport and in render. + + .. _bpy.types.GreasePencilLayerGroup.lock: + + Lock (padlock icon) + Toggle all the layers of this group from being editable. diff --git a/manual/grease_pencil/properties/layers.rst b/manual/grease_pencil/properties/layers.rst index f9eedffca..d55463cc4 100644 --- a/manual/grease_pencil/properties/layers.rst +++ b/manual/grease_pencil/properties/layers.rst @@ -22,6 +22,8 @@ The selected layer is the active layer. Only one layer or group can be active at 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 :doc:`Layer Groups `. + Every layer correspond to a channel in the Dope Sheet editor (in Grease Pencil mode). See :doc:`Dope Sheet ` for more information. @@ -113,7 +115,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 :doc:`Layer Group ` into a single layer. Merge All Combine all layers into the active layer. -- 2.30.2 From b916f1ddb67f9a59b83dbf3df3411cd9d3669b6b Mon Sep 17 00:00:00 2001 From: Falk David Date: Tue, 8 Oct 2024 15:02:31 +0200 Subject: [PATCH 04/11] Fix warnings --- manual/grease_pencil/properties/data.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manual/grease_pencil/properties/data.rst b/manual/grease_pencil/properties/data.rst index c897d36fc..2714145d2 100644 --- a/manual/grease_pencil/properties/data.rst +++ b/manual/grease_pencil/properties/data.rst @@ -19,7 +19,7 @@ Strokes can be grouped in 2D layers, a special Grease Pencil layers that help to organize the drawing order and visibility of the strokes. :doc:`Layer Groups ` -================================================ +============================================================ Layers can be organized into layer groups. This helps to get a better overview when a file contains a lot of layers. Groups can be hidden and locked just like @@ -56,5 +56,6 @@ Create and manage your own properties to store data in the Grease Pencil's data- :hidden: layers.rst + layer_groups.rst onion_skinning.rst strokes.rst -- 2.30.2 From 3c94d97b961ae0e4847fd0db9b3d2422d14087c3 Mon Sep 17 00:00:00 2001 From: Falk David Date: Tue, 8 Oct 2024 15:28:15 +0200 Subject: [PATCH 05/11] Add page for layer attributes --- manual/grease_pencil/properties/data.rst | 6 ++++++ .../properties/layer_attributes.rst | 17 +++++++++++++++++ manual/grease_pencil/properties/layers.rst | 2 ++ .../geometry_nodes/attributes_reference.rst | 1 + 4 files changed, 26 insertions(+) create mode 100644 manual/grease_pencil/properties/layer_attributes.rst diff --git a/manual/grease_pencil/properties/data.rst b/manual/grease_pencil/properties/data.rst index 2714145d2..9981c55f3 100644 --- a/manual/grease_pencil/properties/data.rst +++ b/manual/grease_pencil/properties/data.rst @@ -45,6 +45,10 @@ An object can have several weight groups and can be assigned in General settings for Grease Pencil strokes. +:doc:`Attributes ` +============================================================== + +List of custom layer attributes. :ref:`Custom Properties ` ============================================================== @@ -59,3 +63,5 @@ Create and manage your own properties to store data in the Grease Pencil's data- layer_groups.rst onion_skinning.rst strokes.rst + layer_attributes.rst + diff --git a/manual/grease_pencil/properties/layer_attributes.rst b/manual/grease_pencil/properties/layer_attributes.rst new file mode 100644 index 000000000..b67bf7baa --- /dev/null +++ b/manual/grease_pencil/properties/layer_attributes.rst @@ -0,0 +1,17 @@ +**************** +Layer Attributes +**************** + +Layers can store :doc:`Custom Attributes `. +The attributes are stored on the :ref:`Layer ` domain. + +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. diff --git a/manual/grease_pencil/properties/layers.rst b/manual/grease_pencil/properties/layers.rst index d55463cc4..5cb8c2e06 100644 --- a/manual/grease_pencil/properties/layers.rst +++ b/manual/grease_pencil/properties/layers.rst @@ -203,6 +203,8 @@ Transform Allows per-layer location, rotation and scale transformations. +.. _layer-adjustments: + Adjustments =========== 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 -- 2.30.2 From 0a39c7e7b1ad7468932d626f5197e833135e3a2c Mon Sep 17 00:00:00 2001 From: Falk David Date: Tue, 8 Oct 2024 15:33:32 +0200 Subject: [PATCH 06/11] Update modifier introduction page --- manual/grease_pencil/modifiers/introduction.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 ========= -- 2.30.2 From d7be5b899040c6ca65af23cbc13a513cd43f9888 Mon Sep 17 00:00:00 2001 From: Falk David Date: Tue, 8 Oct 2024 15:39:28 +0200 Subject: [PATCH 07/11] Remove drawing guides page --- manual/grease_pencil/modes/draw/guides.rst | 97 ------------------- manual/grease_pencil/modes/draw/index.rst | 1 - .../grease_pencil/modes/draw/introduction.rst | 8 -- 3 files changed, 106 deletions(-) delete mode 100644 manual/grease_pencil/modes/draw/guides.rst diff --git a/manual/grease_pencil/modes/draw/guides.rst b/manual/grease_pencil/modes/draw/guides.rst deleted file mode 100644 index f43ac1694..000000000 --- a/manual/grease_pencil/modes/draw/guides.rst +++ /dev/null @@ -1,97 +0,0 @@ -.. _bpy.types.GPencilSculptGuide: - -****** -Guides -****** - -.. reference:: - - :Mode: Draw Mode - :Header: :menuselection:`Guides` - -Guides are drawing aids that make it easier to create different types of strokes. -The Guides can be activated with the button next to the selector (grid icon). - - -.. _bpy.types.GPencilSculptGuide.type: - -Guide Types -=========== - -.. figure:: /images/grease-pencil_modes_draw_guides_selector.png - :align: right - - Guide selector activated in the 3D Viewport header. - -:Circular: - Constrains the drawing of new strokes to form rings from the selected reference point. -:Radial: - Constrains the drawing of new strokes to form rays from the selected reference point. -:Parallel: - Constrains the drawing of new strokes to form parallel lines. - - Angle - Angle direction of the parallel lines. -:Grid: - Constrains the drawing of new strokes to form parallel horizontal or vertical lines. -:Isometric: - Constrains the drawing of new strokes to vertical or isometric lines. - - Angle - Angle direction of the isometric lines. - - -Common Options --------------- - -.. _bpy.types.GPencilSculptGuide.use_snapping: - -Use Snapping - When enabled, snap the drawn strokes to an angle or spacing. - - Spacing - Guide spacing. - -.. _bpy.types.GPencilSculptGuide.reference_point: - -Reference Point - Determines the origin point to use for the creation of the lines. - Applies only for *Circular* and *Radial* guides. - - :Cursor: Use the cursor as a reference point. - :Custom: Use a custom location as a reference point. - - Custom Location - X, Y Z - - :Object: Use an object as a reference point. - - Object - A :ref:`Data ID menu ` to select the object (usually an empty), - which location will be used as a reference point. - - -Examples -======== - -.. list-table:: Examples of strokes using different types of Guides. - - * - .. figure:: /images/grease-pencil_modes_draw_guides_circular.png - :width: 200px - - Circular Guides. - - - .. figure:: /images/grease-pencil_modes_draw_guides_radial.png - :width: 200px - - Radial Guides. - - - .. figure:: /images/grease-pencil_modes_draw_guides_parallel.png - :width: 200px - - Parallel Guides (30° Angle). - - - .. figure:: /images/grease-pencil_modes_draw_guides_grid.png - :width: 200px - - Grid Guides. diff --git a/manual/grease_pencil/modes/draw/index.rst b/manual/grease_pencil/modes/draw/index.rst index 7f698982f..f63229c64 100644 --- a/manual/grease_pencil/modes/draw/index.rst +++ b/manual/grease_pencil/modes/draw/index.rst @@ -13,4 +13,3 @@ tool_settings/index.rst stroke_placement.rst drawing_planes.rst - guides.rst diff --git a/manual/grease_pencil/modes/draw/introduction.rst b/manual/grease_pencil/modes/draw/introduction.rst index 19c028ae3..dc8f20f6f 100644 --- a/manual/grease_pencil/modes/draw/introduction.rst +++ b/manual/grease_pencil/modes/draw/introduction.rst @@ -59,14 +59,6 @@ The Drawing Planes selector defines the plane (orientation) to which the new str See :doc:`Drawing Planes ` for more information. -Guides ------- - -Different Guides types can be activated to assist you when drawing new strokes. - -See :doc:`Guides ` for more information. - - .. _bpy.types.ToolSettings.use_gpencil_draw_additive: Drawing Options -- 2.30.2 From c964efe1a85626182713a07b31102132405fd9ef Mon Sep 17 00:00:00 2001 From: Falk David Date: Tue, 8 Oct 2024 15:43:43 +0200 Subject: [PATCH 08/11] Remove page about curve editing --- .../modes/edit/curve_editing.rst | 104 ------------------ manual/grease_pencil/modes/edit/index.rst | 1 - 2 files changed, 105 deletions(-) delete mode 100644 manual/grease_pencil/modes/edit/curve_editing.rst diff --git a/manual/grease_pencil/modes/edit/curve_editing.rst b/manual/grease_pencil/modes/edit/curve_editing.rst deleted file mode 100644 index 89ff66411..000000000 --- a/manual/grease_pencil/modes/edit/curve_editing.rst +++ /dev/null @@ -1,104 +0,0 @@ -.. _bpy.types.GreasePencil.use_curve_edit: - -************* -Curve Editing -************* - -Curve Editing allows you to edit Grease Pencil strokes using Bézier curves. - - -Usage -===== - -#. Select the desired strokes to edit as curves. -#. Activate curve editing in the 3D Viewport's header with the toggle button (Bézier curve icon). -#. Once activated you can: - - - Edit the curves with the curve handles. - - Select strokes to automatically convert them to curves. - -.. note:: - - Selecting :doc:`points in between ` is disabled while in curve editing is active. - -.. seealso:: - - The curve editing handles display can be tweaked in - the :ref:`Overlays ` popover. - - -Curve Editing Popover -===================== - -.. reference:: - - :Mode: Edit Mode - :Panel: :menuselection:`3D Viewport --> Header --> Curve Editing` - -.. figure:: /images/grease-pencil_modes_edit_curve-editing_panel.png - - Curve Editing popover. - -.. _bpy.types.GreasePencil.edit_curve_resolution: - -Curve Resolution - Number of points generated along each curve segment (between two handles) if *Adaptive Resolution* is disabled. - -.. _bpy.types.GreasePencil.curve_edit_threshold: - -Threshold - Threshold used for curve fitting. Maximum distance the fitted curve can deviate from the target stroke. - A threshold of 0.0 will generate a curve point for every stroke point. Higher thresholds will result in higher - approximations of the target stroke but also smoother curve. - -.. _bpy.types.GreasePencil.curve_edit_corner_angle: - -Corner Angle - Any detected corner with an angle above the specified amount will create a sharp (non-aligned) handle. - -.. _bpy.types.GreasePencil.use_adaptive_curve_resolution: - -Adaptive Resolution - When activated, the *Curve Resolution* is no longer constant for all curve segments but calculated dynamically. - The length of each segment is approximated, then multiplied by the *Curve Resolution* and rounded down. - This will be the number of points to generate for that segment. - With Adaptive Resolution the points will be distribute more evenly across all the strokes. - The *Curve Resolution* option will change the point density. - - .. list-table:: Adaptive Resolution. - - * - .. figure:: /images/grease-pencil_modes_edit_curve-editing_adaptive-resolution-off.png - :width: 320px - - Off. - - - .. figure:: /images/grease-pencil_modes_edit_curve-editing_adaptive-resolution-on.png - :width: 320px - - On. - - -Curve Data -========== - -Once a stroke has been converted to a curve, the data will be saved to the file. -When Curve Editing is deactivated and the curve is changed, for example using -:doc:`Sculpt Mode `, -then the curve will be refitted once Curve Editing is activated again. - - -Operators -========= - -Curve editing is currently more limited than stroke editing. -Every operation in Edit Mode for strokes and stroke points work for curves as well except for the following: - -- Duplicate -- Copy and Paste -- Snap to Cursor and Cursor to selected -- Flip -- Simplify and Simplify Fixed -- Trim -- Separate -- Split -- Interpolate diff --git a/manual/grease_pencil/modes/edit/index.rst b/manual/grease_pencil/modes/edit/index.rst index 999d859c5..c5c56e25f 100644 --- a/manual/grease_pencil/modes/edit/index.rst +++ b/manual/grease_pencil/modes/edit/index.rst @@ -9,7 +9,6 @@ introduction.rst selecting.rst tools.rst - curve_editing.rst grease_pencil_menu.rst stroke_menu.rst point_menu.rst -- 2.30.2 From fbb61339b85d901110ad862ea76adbc2b9237fa6 Mon Sep 17 00:00:00 2001 From: Falk David Date: Tue, 8 Oct 2024 15:52:12 +0200 Subject: [PATCH 09/11] Remove Transform Fill tool --- manual/grease_pencil/modes/edit/tools.rst | 3 --- 1 file changed, 3 deletions(-) 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. -- 2.30.2 From aa248644844187ff63d0afa592f0737464a6488b Mon Sep 17 00:00:00 2001 From: Falk David Date: Tue, 8 Oct 2024 17:21:15 +0200 Subject: [PATCH 10/11] Remove attributes page, move to `data` --- manual/grease_pencil/properties/data.rst | 27 +++++++++---------- .../properties/layer_attributes.rst | 17 ------------ 2 files changed, 12 insertions(+), 32 deletions(-) delete mode 100644 manual/grease_pencil/properties/layer_attributes.rst diff --git a/manual/grease_pencil/properties/data.rst b/manual/grease_pencil/properties/data.rst index 5344cd81a..c5f0c9a1d 100644 --- a/manual/grease_pencil/properties/data.rst +++ b/manual/grease_pencil/properties/data.rst @@ -43,11 +43,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 ` @@ -58,16 +66,6 @@ An object can have several weight groups and can be assigned in :doc:`Weight Paint Mode `. -:doc:`Settings ` -=================================================== - -General settings for Grease Pencil strokes. - -:doc:`Attributes ` -============================================================== - -List of custom layer attributes. - :ref:`Custom Properties ` ============================================================== @@ -81,5 +79,4 @@ Create and manage your own properties to store data in the Grease Pencil's data- layer_groups.rst onion_skinning.rst strokes.rst - layer_attributes.rst diff --git a/manual/grease_pencil/properties/layer_attributes.rst b/manual/grease_pencil/properties/layer_attributes.rst deleted file mode 100644 index b67bf7baa..000000000 --- a/manual/grease_pencil/properties/layer_attributes.rst +++ /dev/null @@ -1,17 +0,0 @@ -**************** -Layer Attributes -**************** - -Layers can store :doc:`Custom Attributes `. -The attributes are stored on the :ref:`Layer ` domain. - -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. -- 2.30.2 From 1f4924a33c93f43d8f73305ba635ec0c1e3ac702 Mon Sep 17 00:00:00 2001 From: Falk David Date: Tue, 8 Oct 2024 17:24:19 +0200 Subject: [PATCH 11/11] Revert adding page for layer groups --- manual/grease_pencil/properties/data.rst | 8 +--- .../grease_pencil/properties/layer_groups.rst | 46 ------------------- manual/grease_pencil/properties/layers.rst | 9 ++-- 3 files changed, 7 insertions(+), 56 deletions(-) delete mode 100644 manual/grease_pencil/properties/layer_groups.rst diff --git a/manual/grease_pencil/properties/data.rst b/manual/grease_pencil/properties/data.rst index c5f0c9a1d..c6af16bbe 100644 --- a/manual/grease_pencil/properties/data.rst +++ b/manual/grease_pencil/properties/data.rst @@ -17,13 +17,8 @@ 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:`Layer Groups ` -============================================================ - -Layers can be organized into layer groups. This helps to get a better overview -when a file contains a lot of layers. Groups can be hidden and locked just like -layers. :doc:`Onion Skinning ` ================================================================ @@ -76,7 +71,6 @@ Create and manage your own properties to store data in the Grease Pencil's data- :hidden: layers.rst - layer_groups.rst onion_skinning.rst strokes.rst diff --git a/manual/grease_pencil/properties/layer_groups.rst b/manual/grease_pencil/properties/layer_groups.rst deleted file mode 100644 index 02ea28bca..000000000 --- a/manual/grease_pencil/properties/layer_groups.rst +++ /dev/null @@ -1,46 +0,0 @@ -.. _bpy.types.GreasePencilLayerGroup - -************ -Layer Groups -************ - -.. reference:: - - :Mode: All Modes - :Panel: :menuselection:`Object Data tab --> Layers` - :Shortcut: :kbd:`Y` - -.. figure:: /images/grease-pencil_properties_layers_panel.png - :align: right - - Grease Pencil Layers panel. - -The :doc:`Layers ` in a Grease Pencil objects can be -grouped into a Layer Group. - -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. - -Layer Tree - :ref:`Tree view ` of all layers and groups for the Grease Pencil object. - - Next to the group name there are four icons buttons that control common properties of the group: - - Use Mask (mask icon) - Toggle the affect of :ref:`Masks ` on all the layers inside the group. - - .. _bpy.types.GreasePencilLayerGroup.use_onion_skinning: - - Onion Skinning (onion skin icon) - Toggle using the layers inside the group for :doc:`Onion Skinning `. - - .. _bpy.types.GreasePencilLayerGroup.hide: - - Hide (eye icon) - Toggle all the layer visibility of this group in the viewport and in render. - - .. _bpy.types.GreasePencilLayerGroup.lock: - - Lock (padlock icon) - Toggle all the layers of this group from being editable. diff --git a/manual/grease_pencil/properties/layers.rst b/manual/grease_pencil/properties/layers.rst index 5cb8c2e06..12a7eac1f 100644 --- a/manual/grease_pencil/properties/layers.rst +++ b/manual/grease_pencil/properties/layers.rst @@ -22,7 +22,10 @@ The selected layer is the active layer. Only one layer or group can be active at 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 :doc:`Layer Groups `. +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. @@ -51,7 +54,7 @@ the layer becomes prepared to be masked by other layer(s). See :doc:`Overlays ` for more information. Layer Tree - :ref:`Tree view ` of all layers and groups for the Grease Pencil object. + 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: @@ -115,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 :doc:`Layer 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. -- 2.30.2