[Bf-docboard-svn] bf-manual: [8741] trunk/blender_docs/manual: Merge branch 'blender-3.0-release'
Aaron Carlisle
noreply at blender.org
Thu Dec 2 23:39:57 CET 2021
Revision: 8741
https://developer.blender.org/rBM8741
Author: Blendify
Date: 2021-12-02 23:39:57 +0100 (Thu, 02 Dec 2021)
Log Message:
-----------
Merge branch 'blender-3.0-release'
Modified Paths:
--------------
trunk/blender_docs/manual/editors/3dview/startup_scene.rst
trunk/blender_docs/manual/grease_pencil/modifiers/generate/line_art.rst
trunk/blender_docs/manual/render/materials/line_art.rst
trunk/blender_docs/manual/scene_layout/collections/collections.rst
Added Paths:
-----------
trunk/blender_docs/manual/images/grease-pencil_modifiers_generate_line-art_collection-mask.png
trunk/blender_docs/manual/images/grease-pencil_modifiers_generate_line-art_face-mark-filtering-example.png
trunk/blender_docs/manual/images/grease-pencil_modifiers_generate_line-art_face-mark-filtering-panel.png
Property Changed:
----------------
trunk/blender_docs/
Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs 2021-12-02 22:38:56 UTC (rev 8740)
+++ trunk/blender_docs 2021-12-02 22:39:57 UTC (rev 8741)
Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
/branches/blender-2.92-release/blender_docs:7610-7921
/branches/blender-2.93-release/blender_docs:7959-8113
-/branches/blender-3.0-release/blender_docs:8543-8731
\ No newline at end of property
+/branches/blender-3.0-release/blender_docs:8543-8740
\ No newline at end of property
Modified: trunk/blender_docs/manual/editors/3dview/startup_scene.rst
===================================================================
--- trunk/blender_docs/manual/editors/3dview/startup_scene.rst 2021-12-02 22:38:56 UTC (rev 8740)
+++ trunk/blender_docs/manual/editors/3dview/startup_scene.rst 2021-12-02 22:39:57 UTC (rev 8741)
@@ -34,7 +34,7 @@
is used for placing objects in the scene.
Grid Floor
The gray squares forming a floor mark the zero height of the world.
- The red and green lines are the axis of the world coordinate system.
+ The red and green lines are the axes of the world coordinate system.
They meet at the origin, which is also the position of the *Cube*.
The Grid Floor settings are in the :doc:`Viewport Overlays </editors/3dview/display/overlays>` popover.
Modified: trunk/blender_docs/manual/grease_pencil/modifiers/generate/line_art.rst
===================================================================
--- trunk/blender_docs/manual/grease_pencil/modifiers/generate/line_art.rst 2021-12-02 22:38:56 UTC (rev 8740)
+++ trunk/blender_docs/manual/grease_pencil/modifiers/generate/line_art.rst 2021-12-02 22:39:57 UTC (rev 8741)
@@ -23,6 +23,15 @@
The Line Art modifier.
+.. _bpy.types.LineartGpencilModifier.use_cache:
+
+Use Cache
+ Optimize rendering by using cached scene data from the first line art modifier in the stack.
+ This option has the disadvantage of certain settings becoming unavailable
+
+ This option only available when you have more than one Line Art modifier
+ is the same modifier stack and the modifier is not the first Line Art modifier in the stack.
+
Source Type
What type of geometry source should line art be generated from.
@@ -46,6 +55,13 @@
Geometry Processing
-------------------
+.. _bpy.types.LineartGpencilModifier.source_camera:
+.. _bpy.types.LineartGpencilModifier.use_custom_camera:
+
+Custom Camera
+ Use custom camera instead of the active camera for calculating strokes.
+ Useful when baking multiple shots in different angle as well as for motion graphics effects.
+
Remove Doubles
Perform a "merge by distance" operation when loading geometry into Line Art.
The threshold of this operation is internally set to a value that is optimal for Line Art algorithm precision.
@@ -82,6 +98,11 @@
Contour
Where the edge becomes the separation line of front/backfacing faces.
+.. _bpy.types.LineartGpencilModifier.use_loose:
+
+Loose
+ Generate strokes for edges that do not form a :term:`Face`.
+
Material Borders
Where the edge separates faces with different materials.
@@ -97,7 +118,13 @@
Crease Threshold
Edge angles that are smaller than this value will be treated as crease.
+.. _bpy.types.LineartGpencilModifier.use_overlap_edge_type_support:
+Allow Overlap
+ Allow an edge to have multiple overlapping types.
+ This will create a separate stroke for each overlapping type.
+
+
Style
-----
@@ -129,25 +156,71 @@
A value of 1 means selecting lines that have been occluded by exactly one layer of faces.
-Transparency
-^^^^^^^^^^^^
+Material Mask
+^^^^^^^^^^^^^
If enabled, Line Art will only select lines that are occluded by certain faces whose material
have specific occlusion masks set.
Masks
- To select edges that have been occluded by selected masks.
+ To select edges that have been occluded by the selected
+ :ref:`Material Mask <bpy.types.MaterialLineArt.use_material_mask_bits>`.
Exact Match
- If enabled, only lines that are occluded with the exact transparency bit combination will be selected.
- Otherwise, lines that have been occluded by any one of specified transparency masks will be selected.
+ If enabled, only lines that are occluded with the exact mask bit combination will be selected.
+ Otherwise, lines that have been occluded by any one of specified material masks will be selected.
.. figure:: /images/grease-pencil_modifiers_generate_line-art_transparency-mask.png
:align: right
- Demonstration of the usage of transparency masks.
+ Demonstration of the usage of material masks.
+Intersection
+------------
+
+Allows you to select edges that intersect between two collections.
+
+.. _bpy.types.LineartGpencilModifier.use_intersection_mask:
+
+Collection Mask
+ Mask bits to match from :ref:`Collection Line Art <bpy.types.Collection.lineart_intersection_mask>` properties.
+
+.. _bpy.types.LineartGpencilModifier.use_intersection_match:
+
+Exact Match
+ Require matching all intersection masks instead of just one.
+
+.. figure:: /images/grease-pencil_modifiers_generate_line-art_collection-mask.png
+
+ Demonstration of the usage of collection masks.
+
+
+.. _bpy.types.LineartGpencilModifier.use_face_mark:
+
+Face Mark Filtering
+-------------------
+
+.. figure:: /images/grease-pencil_modifiers_generate_line-art_face-mark-filtering-panel.png
+
+ Face Mark Filtering subpanel.
+
+*Face Mark Filtering* can be used to have manual control over which
+feature edges produce strokes by using Freestyle face marks.
+
+.. _bpy.types.LineartGpencilModifier.use_face_mark_invert:
+
+Invert
+ Invert face mark filtering.
+
+.. _bpy.types.LineartGpencilModifier.use_face_mark_boundaries:
+
+Boundaries
+ Filter feature lines based on face mark boundaries.
+
+.. figure:: /images/grease-pencil_modifiers_generate_line-art_face-mark-filtering-example.png
+
+
Chaining
--------
@@ -169,6 +242,15 @@
All Lines
Enabling this option will cause all lines to have the type of contour and to be chained together.
+ Loose Edges
+ Allow floating Edges that do not form a face to be chained together.
+
+ Loose as Contour
+ Edges that do not form a face will be classified as contour lines.
+
+ Geometry Space
+ Use geometry distance for chaining instead of image space.
+
Image Threshold
Allow the end point of short segments to be chained together if the 2D image space distance
between them are within the specified threshold.
@@ -229,7 +311,12 @@
Move strokes slightly towards the camera to avoid clipping while preserve depth for the viewport.
This option will be grayed out unless :ref:`Show in Front <bpy.types.Object.show_in_front>` is disabled.
+.. _bpy.types.LineartGpencilModifier.use_offset_towards_custom_camera:
+Towards Custom Camera
+ Offset strokes towards selected camera (see *Custom Camera* above) instead of the active camera.
+
+
Bake
----
Copied: trunk/blender_docs/manual/images/grease-pencil_modifiers_generate_line-art_collection-mask.png (from rev 8740, branches/blender-3.0-release/blender_docs/manual/images/grease-pencil_modifiers_generate_line-art_collection-mask.png)
===================================================================
(Binary files differ)
Copied: trunk/blender_docs/manual/images/grease-pencil_modifiers_generate_line-art_face-mark-filtering-example.png (from rev 8740, branches/blender-3.0-release/blender_docs/manual/images/grease-pencil_modifiers_generate_line-art_face-mark-filtering-example.png)
===================================================================
(Binary files differ)
Copied: trunk/blender_docs/manual/images/grease-pencil_modifiers_generate_line-art_face-mark-filtering-panel.png (from rev 8740, branches/blender-3.0-release/blender_docs/manual/images/grease-pencil_modifiers_generate_line-art_face-mark-filtering-panel.png)
===================================================================
(Binary files differ)
Modified: trunk/blender_docs/manual/render/materials/line_art.rst
===================================================================
--- trunk/blender_docs/manual/render/materials/line_art.rst 2021-12-02 22:38:56 UTC (rev 8740)
+++ trunk/blender_docs/manual/render/materials/line_art.rst 2021-12-02 22:39:57 UTC (rev 8741)
@@ -1,3 +1,4 @@
+.. _bpy.types.MaterialLineArt:
********
Line Art
@@ -10,13 +11,20 @@
.. figure:: /images/render_materials_line-art_panel.png
:align: right
- Line art transparency settings in material.
+ Line Art material properties.
-Transparency masks provide line art a way to record extra information about faces
-that caused the occlusion, so edges occluded by those faces can be selected to have different styles.
+.. _bpy.types.MaterialLineArt.use_material_mask:
-Use Transparency
- Cause line art to read transparency masks in this material.
+Material Mask
+ Material masks provide line art a way to record extra information about faces
+ that caused the occlusion, so edges occluded by those faces can be selected to have different styles.
-Transparency Masks
- Faces with this material will have selected transparency mask bits in line art.
+.. _bpy.types.MaterialLineArt.use_material_mask_bits:
+
+Masks
+ The layer to to include faces of the current material.
+
+.. _bpy.types.MaterialLineArt.mat_occlusion:
+
+Levels
+ Faces with this material will behave as if it has set number of layers in occlusion.
Modified: trunk/blender_docs/manual/scene_layout/collections/collections.rst
===================================================================
--- trunk/blender_docs/manual/scene_layout/collections/collections.rst 2021-12-02 22:38:56 UTC (rev 8740)
+++ trunk/blender_docs/manual/scene_layout/collections/collections.rst 2021-12-02 22:39:57 UTC (rev 8741)
@@ -52,9 +52,30 @@
Line Art
--------
-Todo.
+.. _bpy.types.Collection.lineart_usage:
+Usage
+ How to use this collection in line art.
+ :Include: Generate feature lines for this collection.
+ :Occlusion Only: Only use the collection to produce occlusion.
+ :Exclude: Don’t use this collection in line art.
+ :Intersection Only: Only generate intersection lines for this collection.
+ :No Intersection: Include this collection but do not generate intersection lines.
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-docboard-svn
mailing list