[Bf-docboard-svn] bf-manual: [9211] branches/blender-3.1-release/blender_docs/manual: Make rst files similar to master for merging
Alaska
noreply at blender.org
Fri Apr 22 03:25:21 CEST 2022
Revision: 9211
https://developer.blender.org/rBM9211
Author: Alaska
Date: 2022-04-22 03:25:20 +0200 (Fri, 22 Apr 2022)
Log Message:
-----------
Make rst files similar to master for merging
Modified Paths:
--------------
branches/blender-3.1-release/blender_docs/manual/addons/mesh/tissue.rst
branches/blender-3.1-release/blender_docs/manual/troubleshooting/recover.rst
Modified: branches/blender-3.1-release/blender_docs/manual/addons/mesh/tissue.rst
===================================================================
--- branches/blender-3.1-release/blender_docs/manual/addons/mesh/tissue.rst 2022-04-22 01:08:37 UTC (rev 9210)
+++ branches/blender-3.1-release/blender_docs/manual/addons/mesh/tissue.rst 2022-04-22 01:25:20 UTC (rev 9211)
@@ -7,7 +7,8 @@
.. figure:: /images/addons_mesh_tissue_cover.jpg
Tissue is a collection of tools that facilitate the use of computational-design techniques inside Blender.
-It consists of different tools, visible in the right panel. According to the active mode, different tools are displayed:
+It consists of different tools, visible in the right panel.
+According to the active mode, different tools are displayed:
- :ref:`Tissue Tools <tissue tools>` (visible in Edit Mode and Object Mode)
- :ref:`Tissue Weight Tools <tissue weight tools>` (visible in Weight Paint Mode)
@@ -46,7 +47,8 @@
.. figure:: /images/addons_mesh_tissue_tessellate-operator.jpg
-Later it will be possible to change them, together with more advanced settings from the *Object Data Panel* of the generated object.
+Later it will be possible to change them,
+together with more advanced settings from the *Object Data Panel* of the generated object.
.. figure:: /images/addons_mesh_tissue_tessellate-panel.jpg
@@ -160,7 +162,8 @@
Weight and Morphing
- Combine the Vertex Groups of the base object with the Shape Keys from the component, in order to generate morphing components.
+ Combine the Vertex Groups of the base object with the Shape Keys from the component,
+ in order to generate morphing components.
.. figure:: /images/addons_mesh_tissue_tessellate-weight-and-morphing.jpg
@@ -310,7 +313,8 @@
Weight Formula
--------------
-Weight based on Vertices parameters. Allows to use vertices coordinates and normals direction. Integer and Float sliders can be created in order to find the proper parameters more easily.
+Weight based on Vertices parameters. Allows to use vertices coordinates and normals direction.
+Integer and Float sliders can be created in order to find the proper parameters more easily.
.. figure:: /images/addons_mesh_tissue_weight-formula.jpg
@@ -334,7 +338,8 @@
Edges Deformation
-----------------
-Generate a Vertex Group based on Edges Deformation evaluated on the Modifiers result (Deformation Modifiers and Simulations)
+Generate a Vertex Group based on Edges Deformation evaluated on the Modifiers result
+(Deformation Modifiers and Simulations)
.. figure:: /images/addons_mesh_tissue_weight-edges-deformation.jpg
@@ -341,7 +346,8 @@
Edges Bending
-------------
-Generate a Vertex Group based on Edges Bending evaluated on the Modifiers result (Deformation Modifiers and Simulations)
+Generate a Vertex Group based on Edges Bending evaluated on the Modifiers result
+(Deformation Modifiers and Simulations).
.. figure:: /images/addons_mesh_tissue_weight-edges-bending.jpg
Modified: branches/blender-3.1-release/blender_docs/manual/troubleshooting/recover.rst
===================================================================
--- branches/blender-3.1-release/blender_docs/manual/troubleshooting/recover.rst 2022-04-22 01:08:37 UTC (rev 9210)
+++ branches/blender-3.1-release/blender_docs/manual/troubleshooting/recover.rst 2022-04-22 01:25:20 UTC (rev 9211)
@@ -19,13 +19,22 @@
used to roll back from mistakes under normal operation, or return back to a specific action.
See :doc:`/interface/undo_redo`.
-The *Save & Load* tab of the *Preferences* allows you to configure the two ways
-that Blender provides for you to regress to a previous version of your work.
-See :ref:`Auto Save Preferences <prefs-auto-save>` for details.
+.. _troubleshooting-file_recovery-save_versions:
-.. _troubleshooting-file-recovery:
+Recovering Save Versions
+========================
+By default Blender keeps an additional backup when saving files.
+So saving renames the previously saved file with a ``.blend1`` extension instead of overwriting it.
+
+This file can be used to revert to a previous state.
+
+See :ref:`Save Versions <prefs-save_load-backups>` to configure the number of versions kept.
+
+
+.. _troubleshooting-file_recovery-auto_save:
+
Recovering Auto Saves
=====================
@@ -53,6 +62,8 @@
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.
+See :ref:`Auto Save Preferences <prefs-auto-save>` to configure auto-save.
+
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,
@@ -61,8 +72,7 @@
.. tip::
- 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.
+ Enable the detailed list view when browsing auto-saved files to show which is the most recent.
.. figure:: /images/troubleshooting_recover_display-file-date.png
@@ -70,6 +80,6 @@
.. 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.
- Hence, you will not be able to go back more than a few minutes with this tool.
+ When recovering an *Auto Saved* file, any changes made since the last *Auto Save* will be lost.
+ Only one *Auto Saved* file exists for each ``.blend`` file, i.e. Blender does not keep older versions.
+ Therefor, you will only be able to restore the most recent *Auto Save* file.
More information about the Bf-docboard-svn
mailing list