[Bf-docboard-svn] bf-manual: [8598] trunk/blender_docs/manual: Merge branch 'blender-3.0-release'
Aaron Carlisle
noreply at blender.org
Sat Nov 6 00:15:28 CET 2021
Revision: 8598
https://developer.blender.org/rBM8598
Author: Blendify
Date: 2021-11-06 00:15:28 +0100 (Sat, 06 Nov 2021)
Log Message:
-----------
Merge branch 'blender-3.0-release'
Modified Paths:
--------------
trunk/blender_docs/manual/editors/graph_editor/channels.rst
trunk/blender_docs/manual/editors/index.rst
trunk/blender_docs/manual/editors/outliner/editing.rst
trunk/blender_docs/manual/editors/preferences/file_paths.rst
trunk/blender_docs/manual/files/linked_libraries/index.rst
trunk/blender_docs/manual/modeling/geometry_nodes/geometry/bounding_box.rst
trunk/blender_docs/manual/modeling/modifiers/generate/geometry_nodes.rst
trunk/blender_docs/manual/scene_layout/object/editing/index.rst
Added Paths:
-----------
trunk/blender_docs/manual/editors/asset_browser.rst
trunk/blender_docs/manual/files/linked_libraries/assets.rst
trunk/blender_docs/manual/scene_layout/object/editing/asset.rst
Property Changed:
----------------
trunk/blender_docs/
Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs 2021-11-05 22:53:38 UTC (rev 8597)
+++ trunk/blender_docs 2021-11-05 23:15:28 UTC (rev 8598)
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-8591
\ No newline at end of property
+/branches/blender-3.0-release/blender_docs:8543-8597
\ No newline at end of property
Copied: trunk/blender_docs/manual/editors/asset_browser.rst (from rev 8597, branches/blender-3.0-release/blender_docs/manual/editors/asset_browser.rst)
===================================================================
--- trunk/blender_docs/manual/editors/asset_browser.rst (rev 0)
+++ trunk/blender_docs/manual/editors/asset_browser.rst 2021-11-05 23:15:28 UTC (rev 8598)
@@ -0,0 +1,69 @@
+
+*************
+Asset Browser
+*************
+
+Todo Introduction.
+
+
+Interface
+=========
+
+Main Region
+-----------
+
+The main region of the Asset Browser acts similar to the :doc:`/editors/file_browser` built into Blender.
+
+
+Header Region
+-------------
+
+The Header Region is above the main region and can aid in navigating and adjust how items are displayed.
+
+
+Source List Region
+------------------
+
+Todo Catalogs.
+
+
+.. _bpy.types.AssetMetaData:
+
+Asset Details Region
+--------------------
+
+Todo.
+
+.. _bpy.types.AssetMetaData.author:
+
+Author
+ Name of the creator of the asset.
+
+
+Preview
+^^^^^^^
+
+Todo.
+
+Tags
+^^^^
+
+Todo.
+
+
+Navigating
+==========
+
+See file browser...
+
+
+Selecting
+=========
+
+See file browser...
+
+
+Editing
+=======
+
+Todo explain items in the context menu.
Modified: trunk/blender_docs/manual/editors/graph_editor/channels.rst
===================================================================
--- trunk/blender_docs/manual/editors/graph_editor/channels.rst 2021-11-05 22:53:38 UTC (rev 8597)
+++ trunk/blender_docs/manual/editors/graph_editor/channels.rst 2021-11-05 23:15:28 UTC (rev 8598)
@@ -22,7 +22,7 @@
.. _bpy.types.DopeSheet.use_filter_invert:
.. _bpy.types.DopeSheet.filter_text:
-Name Filter
+Name Filter :kbd:`Ctrl-F`
Only displays channels that match the search text.
Pressing the invert button displays all channels except the channels that match the search text.
Modified: trunk/blender_docs/manual/editors/index.rst
===================================================================
--- trunk/blender_docs/manual/editors/index.rst 2021-11-05 22:53:38 UTC (rev 8597)
+++ trunk/blender_docs/manual/editors/index.rst 2021-11-05 23:15:28 UTC (rev 8598)
@@ -66,5 +66,6 @@
outliner/index.rst
properties_editor.rst
file_browser.rst
+ asset_browser.rst
preferences/index.rst
spreadsheet.rst
Modified: trunk/blender_docs/manual/editors/outliner/editing.rst
===================================================================
--- trunk/blender_docs/manual/editors/outliner/editing.rst 2021-11-05 22:53:38 UTC (rev 8597)
+++ trunk/blender_docs/manual/editors/outliner/editing.rst 2021-11-05 23:15:28 UTC (rev 8598)
@@ -159,6 +159,24 @@
Selects the linked data, see :ref:`bpy.ops.object.select_linked` for more information.
+Mark As Asset
+-------------
+
+See :ref:`bpy.ops.asset.mark`.
+
+
+Clear Asset
+-----------
+
+See :ref:`bpy.ops.asset.clear`.
+
+
+Clear Asset (Set Fake User)
+---------------------------
+
+See :ref:`assets-clear-set-fake-user`.
+
+
View
----
Modified: trunk/blender_docs/manual/editors/preferences/file_paths.rst
===================================================================
--- trunk/blender_docs/manual/editors/preferences/file_paths.rst 2021-11-05 22:53:38 UTC (rev 8597)
+++ trunk/blender_docs/manual/editors/preferences/file_paths.rst 2021-11-05 23:15:28 UTC (rev 8598)
@@ -97,6 +97,12 @@
The path to the ``/branches`` directory of your local svn-translation copy, to allow translating from the UI.
+Asset Libraries
+===============
+
+Todo Asset Browsing.
+
+
Known Limitations
=================
Copied: trunk/blender_docs/manual/files/linked_libraries/assets.rst (from rev 8597, branches/blender-3.0-release/blender_docs/manual/files/linked_libraries/assets.rst)
===================================================================
--- trunk/blender_docs/manual/files/linked_libraries/assets.rst (rev 0)
+++ trunk/blender_docs/manual/files/linked_libraries/assets.rst 2021-11-05 23:15:28 UTC (rev 8598)
@@ -0,0 +1,47 @@
+
+******
+Assets
+******
+
+Todo Asset Browser.
+
+Explain what assets are.
+
+Creating Assets
+===============
+
+Asset Libraries
+===============
+
+Working With Assets
+===================
+
+Adding Assets to a Scene
+------------------------
+
+
+Editing
+=======
+
+.. _bpy.ops.asset.mark:
+
+Mark As Asset
+-------------
+
+Todo.
+
+
+.. _bpy.ops.asset.clear:
+
+Clear Asset
+-----------
+
+Todo.
+
+
+.. _assets-clear-set-fake-user:
+
+Clear Asset (Set Fake User)
+---------------------------
+
+Todo.
Modified: trunk/blender_docs/manual/files/linked_libraries/index.rst
===================================================================
--- trunk/blender_docs/manual/files/linked_libraries/index.rst 2021-11-05 22:53:38 UTC (rev 8597)
+++ trunk/blender_docs/manual/files/linked_libraries/index.rst 2021-11-05 23:15:28 UTC (rev 8598)
@@ -10,3 +10,4 @@
link_append.rst
library_proxies.rst
library_overrides.rst
+ assets.rst
Modified: trunk/blender_docs/manual/modeling/geometry_nodes/geometry/bounding_box.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/geometry/bounding_box.rst 2021-11-05 22:53:38 UTC (rev 8597)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/geometry/bounding_box.rst 2021-11-05 23:15:28 UTC (rev 8598)
@@ -15,7 +15,7 @@
For instanced geometry, a bounding box is computed for each instance rather than the whole geometry.
To compute the bounding box of the whole geometry,
-you must use a :ref:`/modeling/geometry_nodes/instances/realize_instances`.
+you must use a :doc:`/modeling/geometry_nodes/instances/realize_instances`.
Inputs
Modified: trunk/blender_docs/manual/modeling/modifiers/generate/geometry_nodes.rst
===================================================================
--- trunk/blender_docs/manual/modeling/modifiers/generate/geometry_nodes.rst 2021-11-05 22:53:38 UTC (rev 8597)
+++ trunk/blender_docs/manual/modeling/modifiers/generate/geometry_nodes.rst 2021-11-05 23:15:28 UTC (rev 8598)
@@ -11,7 +11,7 @@
A new Geometry Nodes modifier with a new node group.
-This modifier is supported by mesh and volume objects.
+This modifier is supported by mesh, curve, and volume objects.
Options
Copied: trunk/blender_docs/manual/scene_layout/object/editing/asset.rst (from rev 8597, branches/blender-3.0-release/blender_docs/manual/scene_layout/object/editing/asset.rst)
===================================================================
--- trunk/blender_docs/manual/scene_layout/object/editing/asset.rst (rev 0)
+++ trunk/blender_docs/manual/scene_layout/object/editing/asset.rst 2021-11-05 23:15:28 UTC (rev 8598)
@@ -0,0 +1,23 @@
+
+*****
+Asset
+*****
+
+Todo Asset Browser.
+
+Mark As Asset
+=============
+
+See :ref:`bpy.ops.asset.mark`.
+
+
+Clear Asset
+===========
+
+See :ref:`bpy.ops.asset.clear`.
+
+
+Clear Asset (Set Fake User)
+===========================
+
+See :ref:`assets-clear-set-fake-user`.
Modified: trunk/blender_docs/manual/scene_layout/object/editing/index.rst
===================================================================
--- trunk/blender_docs/manual/scene_layout/object/editing/index.rst 2021-11-05 22:53:38 UTC (rev 8597)
+++ trunk/blender_docs/manual/scene_layout/object/editing/index.rst 2021-11-05 23:15:28 UTC (rev 8598)
@@ -15,6 +15,7 @@
duplicate.rst
duplicate_linked.rst
join.rst
+ asset.rst
parent.rst
relations/index.rst
link_transfer/index.rst
More information about the Bf-docboard-svn
mailing list