[Bf-docboard-svn] bf-manual: [8940] trunk/blender_docs/manual: Merge branch 'blender-3.1-release'
Aaron Carlisle
noreply at blender.org
Wed Feb 9 21:39:55 CET 2022
Revision: 8940
https://developer.blender.org/rBM8940
Author: Blendify
Date: 2022-02-09 21:39:55 +0100 (Wed, 09 Feb 2022)
Log Message:
-----------
Merge branch 'blender-3.1-release'
Modified Paths:
--------------
trunk/blender_docs/Makefile
trunk/blender_docs/manual/compositing/types/converter/index.rst
trunk/blender_docs/manual/editors/asset_browser.rst
trunk/blender_docs/manual/editors/image/image_settings.rst
trunk/blender_docs/manual/grease_pencil/modifiers/deform/index.rst
trunk/blender_docs/manual/grease_pencil/modifiers/generate/dash.rst
trunk/blender_docs/manual/grease_pencil/modifiers/generate/length.rst
trunk/blender_docs/manual/interface/controls/nodes/editing.rst
trunk/blender_docs/manual/interface/controls/nodes/frame.rst
trunk/blender_docs/manual/interface/controls/nodes/groups.rst
trunk/blender_docs/manual/interface/controls/nodes/introduction.rst
trunk/blender_docs/manual/render/color_management.rst
trunk/blender_docs/manual/render/cycles/optimizations/nodes.rst
trunk/blender_docs/manual/render/shader_nodes/vector/bump.rst
Added Paths:
-----------
trunk/blender_docs/manual/compositing/types/converter/color_space.rst
trunk/blender_docs/manual/images/compositing_node-CompositorNodeConvertColorSpace.png
Removed Paths:
-------------
trunk/blender_docs/manual/grease_pencil/modifiers/deform/length.rst
Property Changed:
----------------
trunk/blender_docs/
Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs 2022-02-09 20:38:58 UTC (rev 8939)
+++ trunk/blender_docs 2022-02-09 20:39:55 UTC (rev 8940)
Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/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-8925
-/branches/blender-3.1-release/blender_docs:8904-8929
\ No newline at end of property
+/branches/blender-3.1-release/blender_docs:8904-8939
\ No newline at end of property
Modified: trunk/blender_docs/Makefile
===================================================================
--- trunk/blender_docs/Makefile 2022-02-09 20:38:58 UTC (rev 8939)
+++ trunk/blender_docs/Makefile 2022-02-09 20:39:55 UTC (rev 8940)
@@ -92,7 +92,7 @@
@echo " "$(OPEN_CMD) $(shell pwd)"/$(BUILDDIR)/html/index.html"
livehtml:
- @$(SPHINXAUTOBUILD) --open-browser --delay 0 "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+ @$(SPHINXAUTOBUILD) --open-browser --delay 0 "$(SOURCEDIR)" "$(BUILDDIR)/html" $(SPHINXOPTS) $(O)
latexpdf: .SPHINXBUILD_EXISTS
@$(SPHINXBUILD) -M latexpdf "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
Copied: trunk/blender_docs/manual/compositing/types/converter/color_space.rst (from rev 8939, branches/blender-3.1-release/blender_docs/manual/compositing/types/converter/color_space.rst)
===================================================================
--- trunk/blender_docs/manual/compositing/types/converter/color_space.rst (rev 0)
+++ trunk/blender_docs/manual/compositing/types/converter/color_space.rst 2022-02-09 20:39:55 UTC (rev 8940)
@@ -0,0 +1,49 @@
+.. _bpy.types.CompositorNodeConvertColorSpace:
+
+****************
+Color Space Node
+****************
+
+.. figure:: /images/compositing_node-CompositorNodeConvertColorSpace.png
+ :align: right
+
+ Color Space Node.
+
+The *Color Space Node* converts images from one :term:`color spaces <Color Space>`.
+
+.. note::
+
+ Images are automatically converted into linear color space unless specified in the image's
+ :ref:`Colorspace <bpy.types.ColorManagedInputColorspaceSettings.name>` option.
+
+
+Inputs
+======
+
+Image
+ Standard color input.
+
+
+Properties
+==========
+
+From, To
+ The color space of the input image and the color space to convert the image to.
+
+ The list of color spaces depends on the active :ref:`OCIO config <ocio-config>`.
+ Using the default config will list the following options:
+
+ :sRGB: Standard RGB display space.
+ :Linear: Linear 709 (full range). Blender native linear space.
+ :Linear ACES: ACES linear space.
+ :XYZ: Standard linear XYZ space.
+ :Non-Color: Color space used for images which contains non-color data (e.g. normal maps).
+ :Raw: Does not automatically convert to linear; same as Non-Color.
+ :Filmic Log: Intermediate log color space of Filmic view transform.
+
+
+Outputs
+=======
+
+Image
+ Standard color output.
Modified: trunk/blender_docs/manual/compositing/types/converter/index.rst
===================================================================
--- trunk/blender_docs/manual/compositing/types/converter/index.rst 2022-02-09 20:38:58 UTC (rev 8939)
+++ trunk/blender_docs/manual/compositing/types/converter/index.rst 2022-02-09 20:39:55 UTC (rev 8940)
@@ -16,6 +16,7 @@
:maxdepth: 1
alpha_convert.rst
+ color_space.rst
color_ramp.rst
combine_separate.rst
id_mask.rst
Modified: trunk/blender_docs/manual/editors/asset_browser.rst
===================================================================
--- trunk/blender_docs/manual/editors/asset_browser.rst 2022-02-09 20:38:58 UTC (rev 8939)
+++ trunk/blender_docs/manual/editors/asset_browser.rst 2022-02-09 20:39:55 UTC (rev 8940)
@@ -126,7 +126,17 @@
Generate Preview
Generate/update a preview for the asset.
+Preview
+ Menu of additional preview operators.
+ .. _bpy.ops.ed.lib_id_generate_preview_from_object:
+
+ Render Active Object
+ Generates a preview by based on the 3D Viewport's :term:`Active` object.
+ This is useful for node groups, particularly for geometry nodes,
+ which cannot automatically generate their own preview.
+
+
.. _bpy.ops.asset.tag_add:
.. _bpy.ops.asset.tag_remove:
.. _bpy.types.AssetMetaData.active_tag:
Modified: trunk/blender_docs/manual/editors/image/image_settings.rst
===================================================================
--- trunk/blender_docs/manual/editors/image/image_settings.rst 2022-02-09 20:38:58 UTC (rev 8939)
+++ trunk/blender_docs/manual/editors/image/image_settings.rst 2022-02-09 20:39:55 UTC (rev 8940)
@@ -133,14 +133,19 @@
.. _bpy.types.ColorManagedInputColorspaceSettings.name:
Color Space
- :term:`Color Space`.
+ The :term:`Color Space` the image file was saved in.
+ Once loaded into Blender, the color will be treated as linear color.
+ This option ensure the correct conversion to linear color is used.
+ The list of color spaces depends on the active :ref:`OCIO config <ocio-config>`.
+ Using the default config will list the following options:
+
:sRGB: Standard RGB display space.
:Linear: Linear 709 (full range). Blender native linear space.
:Linear ACES: ACES linear space.
:XYZ: Standard linear XYZ space.
:Non-Color: Color space used for images which contains non-color data (e.g. normal maps).
- :Raw: Same as Non-Color.
+ :Raw: Does not automatically convert to linear; same as Non-Color.
:Filmic Log: Intermediate log color space of Filmic view transform.
.. _bpy.types.Image.alpha_mode:
Modified: trunk/blender_docs/manual/grease_pencil/modifiers/deform/index.rst
===================================================================
--- trunk/blender_docs/manual/grease_pencil/modifiers/deform/index.rst 2022-02-09 20:38:58 UTC (rev 8939)
+++ trunk/blender_docs/manual/grease_pencil/modifiers/deform/index.rst 2022-02-09 20:39:55 UTC (rev 8940)
@@ -9,7 +9,6 @@
armature.rst
hook.rst
lattice.rst
- length.rst
noise.rst
offset.rst
smooth.rst
Deleted: trunk/blender_docs/manual/grease_pencil/modifiers/deform/length.rst
===================================================================
--- trunk/blender_docs/manual/grease_pencil/modifiers/deform/length.rst 2022-02-09 20:38:58 UTC (rev 8939)
+++ trunk/blender_docs/manual/grease_pencil/modifiers/deform/length.rst 2022-02-09 20:39:55 UTC (rev 8940)
@@ -1,31 +0,0 @@
-.. index:: Grease Pencil Modifiers; Length Modifier
-
-***************
-Length Modifier
-***************
-
-The *Length* Modifier extends or shortens the original strokes length.
-
-
-Options
-=======
-
-.. figure:: /images/grease-pencil_modifiers_deform_length_panel.png
- :align: right
-
- Length Modifier.
-
-Mode
- Defines the mode to use for the length calculation.
-
-Factor Start/End
- Length difference for each stroke.
-
-Overshoot
- Sets the calculation precision for the extremes overshoot.
-
-
-Influence
----------
-
-See :ref:`grease-pencil-modifier-influence-filters`.
Modified: trunk/blender_docs/manual/grease_pencil/modifiers/generate/dash.rst
===================================================================
--- trunk/blender_docs/manual/grease_pencil/modifiers/generate/dash.rst 2022-02-09 20:38:58 UTC (rev 8939)
+++ trunk/blender_docs/manual/grease_pencil/modifiers/generate/dash.rst 2022-02-09 20:39:55 UTC (rev 8940)
@@ -24,16 +24,16 @@
Use the plus/minus button on the side of the list to add/remove segments.
- Dash
- The number of consecutive points from the original stroke to include in this segment.
- Gap
- The number of points skipped after the segment ends.
- Radius
- The factor to apply to the original point's radius for the new points.
- Opacity
- The factor to apply to the original point's opacity for the new points.
- Material Index
- Use this index on generated segment, use -1 for existing material.
+Dash
+ The number of consecutive points from the original stroke to include in this segment.
+Gap
+ The number of points skipped after the segment ends.
+Radius
+ The factor to apply to the original point's radius for the new points.
+Opacity
+ The factor to apply to the original point's opacity for the new points.
+Material Index
+ Use this index on generated segment, use -1 for existing material.
Influence Filters
Modified: trunk/blender_docs/manual/grease_pencil/modifiers/generate/length.rst
===================================================================
--- trunk/blender_docs/manual/grease_pencil/modifiers/generate/length.rst 2022-02-09 20:38:58 UTC (rev 8939)
+++ trunk/blender_docs/manual/grease_pencil/modifiers/generate/length.rst 2022-02-09 20:39:55 UTC (rev 8940)
@@ -29,25 +29,28 @@
Used Length
Define what portion of the stroke is used to calculate the direction of the extension.
+
Curvature
- When enabled, the extension will follow the curvature of the stroke.
+---------
- Point Density
- Multiplied by Start/End for the total point count.
+When enabled, the extension will follow the curvature of the stroke.
- Segment Influence
- Factor to determine how much the length of the individual segments
- should influence the final computed curvature. Higher factors makes
- small segments influence the overall curvature less.
+Point Density
+ Multiplied by Start/End for the total point count.
- Filter Angle
- Ignore points on the stroke that deviate from their neighbors by more
- than this angle when determining the extrapolation shape.
+Segment Influence
+ Factor to determine how much the length of the individual segments
+ should influence the final computed curvature. Higher factors makes
+ small segments influence the overall curvature less.
- Invert
- Invert the curvature of the stroke's extension.
+Filter Angle
+ Ignore points on the stroke that deviate from their neighbors by more
+ than this angle when determining the extrapolation shape.
+Invert
+ Invert the curvature of the stroke's extension.
+
Influence Filters
-----------------
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-docboard-svn
mailing list