[Bf-docboard-svn] bf-manual: [8659] trunk/blender_docs/manual: Merge branch 'blender-3.0-release'
Alaska
noreply at blender.org
Mon Nov 22 22:38:33 CET 2021
Revision: 8659
https://developer.blender.org/rBM8659
Author: Alaska
Date: 2021-11-22 22:38:33 +0100 (Mon, 22 Nov 2021)
Log Message:
-----------
Merge branch 'blender-3.0-release'
Modified Paths:
--------------
trunk/blender_docs/manual/compositing/types/color/index.rst
trunk/blender_docs/manual/editors/asset_browser.rst
trunk/blender_docs/manual/editors/graph_editor/introduction.rst
trunk/blender_docs/manual/files/index.rst
trunk/blender_docs/manual/render/cycles/render_settings/performance.rst
trunk/blender_docs/manual/render/cycles/render_settings/sampling.rst
Added Paths:
-----------
trunk/blender_docs/manual/compositing/types/color/posterize.rst
trunk/blender_docs/manual/files/asset_libraries/
trunk/blender_docs/manual/images/asset-browser-catalogs.png
trunk/blender_docs/manual/images/asset-catalog-tree.png
trunk/blender_docs/manual/images/compositing_node-types_CompositorNodePosterize.png
Property Changed:
----------------
trunk/blender_docs/
Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs 2021-11-22 21:35:59 UTC (rev 8658)
+++ trunk/blender_docs 2021-11-22 21:38:33 UTC (rev 8659)
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-8652
\ No newline at end of property
+/branches/blender-3.0-release/blender_docs:8543-8658
\ No newline at end of property
Modified: trunk/blender_docs/manual/compositing/types/color/index.rst
===================================================================
--- trunk/blender_docs/manual/compositing/types/color/index.rst 2021-11-22 21:35:59 UTC (rev 8658)
+++ trunk/blender_docs/manual/compositing/types/color/index.rst 2021-11-22 21:38:33 UTC (rev 8659)
@@ -20,6 +20,7 @@
hue_saturation.rst
invert.rst
mix.rst
+ posterize.rst
rgb_curves.rst
tone_map.rst
- z_combine.rst
+ z_combine.rst
Copied: trunk/blender_docs/manual/compositing/types/color/posterize.rst (from rev 8658, branches/blender-3.0-release/blender_docs/manual/compositing/types/color/posterize.rst)
===================================================================
--- trunk/blender_docs/manual/compositing/types/color/posterize.rst (rev 0)
+++ trunk/blender_docs/manual/compositing/types/color/posterize.rst 2021-11-22 21:38:33 UTC (rev 8659)
@@ -0,0 +1,37 @@
+.. _bpy.types.CompositorNodeHueSat:
+
+*********
+Posterize
+*********
+
+.. figure:: /images/compositing_node-types_CompositorNodePosterize.png
+ :align: right
+
+ Posterize Node.
+
+The *Posterize Node* reduces the number of colors that compose the image
+by converting portions of continuous gradation into abrupt changes from one color to another.
+This node is useful for generating masks in particular for rotoscoping.
+
+
+Inputs
+======
+
+Image
+ Standard image input.
+Steps
+ The number of colors per channel;
+ A value of 8 will result is :math:`3^8 = 512` total colors.
+
+
+Properties
+==========
+
+This node has no properties.
+
+
+Outputs
+=======
+
+Image
+ Standard image output.
Modified: trunk/blender_docs/manual/editors/asset_browser.rst
===================================================================
--- trunk/blender_docs/manual/editors/asset_browser.rst 2021-11-22 21:35:59 UTC (rev 8658)
+++ trunk/blender_docs/manual/editors/asset_browser.rst 2021-11-22 21:38:33 UTC (rev 8659)
@@ -1,11 +1,76 @@
+.. _editors-asset-browser:
*************
Asset Browser
*************
-Todo Introduction.
+This section describes the *Asset Browser*. For general information on Blender's
+asset library system, how to :ref:`create <asset-create>` and :ref:`edit <asset-edit>`
+assets, and design choices, see :doc:`/files/asset_libraries/index`.
+*The Asset Browser was introduced in Blender 3.0, and will be improved and
+expanded over multiple subsequent releases.*
+.. _assets-using:
+
+Using Assets
+=====================
+
+As a general rule, **an asset can be used by dragging it from the Asset Browser
+to the desired location**. Objects and Worlds can be dragged from the asset
+browser into the scene, Materials can be dragged onto the object that should use
+them. The use of pose assets is described in :ref:`pose-library-using`.
+
+There are several things that can happen when an asset is used, depending on the
+**Import Type** configuration of the asset browser:
+
+Link
+ *Same as File > Link...*
+
+ The asset will be linked to the current blend file, and thus be read-only.
+ Subsequent changes to the asset file will be reflected in all files that link
+ it in.
+
+Append
+ *Same as File > Append...*
+
+ All of the asset and all its dependencies will be appended to the current
+ file. Dragging a material into the scene three times will result in three
+ independent copies. Dragging an object into the scene three times will also
+ result in three independent copies.
+
+ "Dependencies" in this case means everything the asset refers to. For an
+ object, this could be its mesh and materials, but also other objects used by
+ modifiers, constraints, or drivers.
+
+ Since the file now has its own copy of the asset, subsequent changes to the
+ asset file will not be reflected in the file it's appended to.
+
+Append (Reuse Data)
+ *Specific to the asset browser.*
+
+ The first time an asset is used, it will be appended, including its
+ dependencies, just like described above. However, Blender will keep track of
+ where it came from, and the next time the asset is used, as much data as
+ possible will be reused. Dragging a material into the scene three times will
+ only load it once, and just assign the same material three times. Dragging an
+ object into the scene three times will create three copies of the object, but
+ all copies will share their mesh data, materials, etc.
+
+ Since the file now has its own copy of the asset, subsequent changes to the
+ asset file will not be reflected in the file it's appended to.
+
+
+Note that all regular Blender operations are available after the asset has been
+added to the current file. For example, you could choose to link an Object to
+the scene; this will also link its Mesh and its Materials. Subsequently you can
+make the Object itself local (Object > Relations > Make Local... > Selected
+Objects), while keeping the Mesh and Materials linked to the asset files. This
+will result in a local, and thus editable, Object, and keep the Mesh and
+Materials automatically up to date with any changes in the asset library.
+
+
+
Interface
=========
Modified: trunk/blender_docs/manual/editors/graph_editor/introduction.rst
===================================================================
--- trunk/blender_docs/manual/editors/graph_editor/introduction.rst 2021-11-22 21:35:59 UTC (rev 8658)
+++ trunk/blender_docs/manual/editors/graph_editor/introduction.rst 2021-11-22 21:38:33 UTC (rev 8659)
@@ -152,9 +152,8 @@
the :ref:`Timeline editor header <animation-editors-timeline-headercontrols>`).
Clear Preview Range :kbd:`Alt-P`
Clears the preview range.
-Auto-Set Preview Range :kbd:`Ctrl-Alt-P`
- Automatically sets the preview range to playback the whole action or
- the selected NLA strips.
+Set Preview Range to Selected :kbd:`Ctrl-Alt-P`
+ Sets the preview range to playback the selected NLA strips.
Markers Menu
Modified: trunk/blender_docs/manual/files/index.rst
===================================================================
--- trunk/blender_docs/manual/files/index.rst 2021-11-22 21:35:59 UTC (rev 8658)
+++ trunk/blender_docs/manual/files/index.rst 2021-11-22 21:38:33 UTC (rev 8659)
@@ -1,7 +1,7 @@
-#######################
- Files & Data System
-#######################
+################################
+ Assets, Files, & Data System
+################################
.. toctree::
:maxdepth: 2
@@ -10,5 +10,7 @@
blend/index.rst
data_blocks.rst
linked_libraries/index.rst
+ asset_libraries/index.rst
+ asset_libraries/catalogs.rst
media/index.rst
import_export.rst
Copied: trunk/blender_docs/manual/images/asset-browser-catalogs.png (from rev 8658, branches/blender-3.0-release/blender_docs/manual/images/asset-browser-catalogs.png)
===================================================================
(Binary files differ)
Copied: trunk/blender_docs/manual/images/asset-catalog-tree.png (from rev 8658, branches/blender-3.0-release/blender_docs/manual/images/asset-catalog-tree.png)
===================================================================
(Binary files differ)
Copied: trunk/blender_docs/manual/images/compositing_node-types_CompositorNodePosterize.png (from rev 8658, branches/blender-3.0-release/blender_docs/manual/images/compositing_node-types_CompositorNodePosterize.png)
===================================================================
(Binary files differ)
Modified: trunk/blender_docs/manual/render/cycles/render_settings/performance.rst
===================================================================
--- trunk/blender_docs/manual/render/cycles/render_settings/performance.rst 2021-11-22 21:35:59 UTC (rev 8658)
+++ trunk/blender_docs/manual/render/cycles/render_settings/performance.rst 2021-11-22 21:38:33 UTC (rev 8659)
@@ -34,8 +34,8 @@
.. _bpy.types.RenderSettings.use_auto_tile:
-Auto Tiles
- Automatically render high resolution images in tiles to reduce memory usage.
+Using Tiling
+ Render high resolution images in tiles to reduce memory usage.
Tiles are cached to disk while rendering to save memory
.. _bpy.types.RenderSettings.tile_size:
Modified: trunk/blender_docs/manual/render/cycles/render_settings/sampling.rst
===================================================================
--- trunk/blender_docs/manual/render/cycles/render_settings/sampling.rst 2021-11-22 21:35:59 UTC (rev 8658)
+++ trunk/blender_docs/manual/render/cycles/render_settings/sampling.rst 2021-11-22 21:38:33 UTC (rev 8659)
@@ -184,21 +184,16 @@
.. _bpy.types.CyclesRenderSettings.scrambling_distance:
-Scrambling Distance
- Lower values give faster rendering with GPU rendering and less noise
- with all devices at the cost of possible artifacts if set too low.
+Scrambling Distance Multiplier
+ Lower values Reduce randomization between pixels to improve GPU rendering performance,
+ at the cost of possible rendering artifacts if set too low.
Only works when not using adaptive sampling.
-
+
.. _bpy.types.CyclesRenderSettings.adaptive_scrambling_distance:
- Adaptive
+ Automatic
Uses a formula to adapt the scrambling distance strength based on the sample count.
- .. note::
-
- When *Adaptive Scrambling Distance* is enabled, *Scrambling Distance* functions like a modifier for
- the *Adaptive Scrambling Distance* value.
-
.. _bpy.types.CyclesRenderSettings.preview_scrambling_distance:
Viewport
More information about the Bf-docboard-svn
mailing list