[Bf-docboard-svn] bf-manual: [7683] trunk/blender_docs/manual: Merge branch 'blender-2.92-release'
Aaron Carlisle
noreply at blender.org
Thu Jan 28 20:27:41 CET 2021
Revision: 7683
https://developer.blender.org/rBM7683
Author: Blendify
Date: 2021-01-28 20:27:40 +0100 (Thu, 28 Jan 2021)
Log Message:
-----------
Merge branch 'blender-2.92-release'
Modified Paths:
--------------
trunk/blender_docs/manual/conf.py
trunk/blender_docs/manual/grease_pencil/modes/draw/tools/erase.rst
trunk/blender_docs/manual/modeling/geometry_nodes/attribute/attribute_color_ramp.rst
trunk/blender_docs/manual/modeling/geometry_nodes/attribute/attribute_mix.rst
trunk/blender_docs/manual/modeling/geometry_nodes/index.rst
trunk/blender_docs/manual/modeling/geometry_nodes/input/random_float.rst
trunk/blender_docs/manual/modeling/geometry_nodes/input/vector.rst
trunk/blender_docs/manual/troubleshooting/recover.rst
Property Changed:
----------------
trunk/blender_docs/
Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs 2021-01-28 19:26:09 UTC (rev 7682)
+++ trunk/blender_docs 2021-01-28 19:27:40 UTC (rev 7683)
Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/branches/blender-2.92-release/blender_docs:7610-7677
\ No newline at end of property
+/branches/blender-2.92-release/blender_docs:7610-7682
\ No newline at end of property
Modified: trunk/blender_docs/manual/conf.py
===================================================================
--- trunk/blender_docs/manual/conf.py 2021-01-28 19:26:09 UTC (rev 7682)
+++ trunk/blender_docs/manual/conf.py 2021-01-28 19:27:40 UTC (rev 7683)
@@ -240,7 +240,7 @@
# If not None, a 'Last updated on:' timestamp is inserted at every page
# bottom, using the given strftime format.
# The empty string is equivalent to '%b %d, %Y'.
-#html_last_updated_fmt = None
+html_last_updated_fmt = '%m/%d/%Y'
# If true, Docutils Smart Quotes transform will be used to convert quotes and dashes to
# typographically correct entities.
Modified: trunk/blender_docs/manual/grease_pencil/modes/draw/tools/erase.rst
===================================================================
--- trunk/blender_docs/manual/grease_pencil/modes/draw/tools/erase.rst 2021-01-28 19:26:09 UTC (rev 7682)
+++ trunk/blender_docs/manual/grease_pencil/modes/draw/tools/erase.rst 2021-01-28 19:27:40 UTC (rev 7683)
@@ -27,6 +27,11 @@
Occlude Eraser (overlapping squares icon)
Erase only strokes visible and not occluded by geometry.
+ .. _bpy.types.BrushGpencilSettings.use_default_eraser:
+
+ Default Eraser
+ Use this brush when enabling the eraser tool with fast switch key (:kbd:`Ctrl`).
+
Mode
Determines how the erase tool behaves.
Modified: trunk/blender_docs/manual/modeling/geometry_nodes/attribute/attribute_color_ramp.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/attribute/attribute_color_ramp.rst 2021-01-28 19:26:09 UTC (rev 7682)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/attribute/attribute_color_ramp.rst 2021-01-28 19:27:40 UTC (rev 7683)
@@ -1,4 +1,5 @@
.. index:: Geometry Nodes; Attribute Color Ramp
+.. _bpy.types.GeometryNodeAttributeColorRamp:
********************
Attribute Color Ramp
Modified: trunk/blender_docs/manual/modeling/geometry_nodes/attribute/attribute_mix.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/attribute/attribute_mix.rst 2021-01-28 19:26:09 UTC (rev 7682)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/attribute/attribute_mix.rst 2021-01-28 19:27:40 UTC (rev 7683)
@@ -1,4 +1,5 @@
.. index:: Geometry Nodes; Attribute Mix
+.. _bpy.types.GeometryNodeAttributeMix:
*************
Attribute Mix
Modified: trunk/blender_docs/manual/modeling/geometry_nodes/index.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/index.rst 2021-01-28 19:26:09 UTC (rev 7682)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/index.rst 2021-01-28 19:27:40 UTC (rev 7683)
@@ -1,5 +1,6 @@
.. index:: Nodes; Geometry Nodes
.. index:: Geometry Nodes
+.. _bpy.types.GeometryNode:
##################
Geometry Nodes
Modified: trunk/blender_docs/manual/modeling/geometry_nodes/input/random_float.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/input/random_float.rst 2021-01-28 19:26:09 UTC (rev 7682)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/input/random_float.rst 2021-01-28 19:27:40 UTC (rev 7683)
@@ -1,4 +1,5 @@
.. index:: Geometry Nodes; Random Float
+.. _bpy.types.FunctionNodeRandomFloat:
************
Random Float
Modified: trunk/blender_docs/manual/modeling/geometry_nodes/input/vector.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/input/vector.rst 2021-01-28 19:26:09 UTC (rev 7682)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/input/vector.rst 2021-01-28 19:27:40 UTC (rev 7683)
@@ -1,4 +1,5 @@
.. index:: Geometry Nodes; Vector
+.. _bpy.types.FunctionNodeInputVector:
******
Vector
Modified: trunk/blender_docs/manual/troubleshooting/recover.rst
===================================================================
--- trunk/blender_docs/manual/troubleshooting/recover.rst 2021-01-28 19:26:09 UTC (rev 7682)
+++ trunk/blender_docs/manual/troubleshooting/recover.rst 2021-01-28 19:27:40 UTC (rev 7683)
@@ -29,16 +29,14 @@
Recovering Auto Saves
=====================
+Last Session
+------------
+
.. admonition:: Reference
:class: refbox
:Menu: :menuselection:`File --> Recover --> Last Session`
- :Menu: :menuselection:`File --> Recover --> Auto Save...`
-
-Recover Last Session
---------------------
-
The *Recover Last Session* will open the ``quit.blend`` file
that is saved into the :ref:`temp-dir` when you quit Blender under normal operation.
Note that files in your temporary directory may be deleted when you reboot your computer
@@ -45,27 +43,35 @@
(depending on your system configuration).
-Recover Auto Save
------------------
+Auto Save
+---------
+.. admonition:: Reference
+ :class: refbox
+
+ :Menu: :menuselection:`File --> Recover --> Auto Save`
+
The *Recover Auto Save* allows you to open the *Auto Saved* file.
You will have to navigate to your :ref:`temp-dir`.
The *Auto Saved* files are named using a random number and have a blend extension.
-It is important, when browsing, to enable the detailed list view.
-Otherwise, you will not be able to figure out the dates of the auto-saved blend-files.
-See Fig. :ref:`fig-troubleshooting-file-browser`.
+Trusted Source
+ When enabled, Python scripts and drivers that may be included in the file will be run automatically.
+ Enable this only if you created the file yourself,
+ or you trust that the person who gave it to you did not include any malicious code with it.
+ See :doc:`Python Security </advanced/scripting/security>` to configure default trust options.
-.. _fig-troubleshooting-file-browser:
+.. tip::
-.. figure:: /images/troubleshooting_recover_display-file-date.png
+ It is important, when browsing, to enable the detailed list view.
+ Otherwise, you will not be able to figure out the dates of the auto-saved blend-files.
- File Browser displaying a vertical list.
+ .. figure:: /images/troubleshooting_recover_display-file-date.png
+ File Browser displaying a vertical list.
+
.. warning::
- When recovering an *Auto Saved* file, you will lose any changes made
- since the last *Auto Save* was performed.
- Only one *Auto Saved* file exists for each project,
- i.e. Blender does not keep older versions.
+ When recovering an *Auto Saved* file, you will lose any changes made since the last *Auto Save* was performed.
+ Only one *Auto Saved* file exists for each project, i.e. Blender does not keep older versions.
Hence, you will not be able to go back more than a few minutes with this tool.
More information about the Bf-docboard-svn
mailing list