[Bf-docboard-svn] bf-manual: [8004] trunk/blender_docs/manual: Merge branch 'blender-v2.93-release'

Aaron Carlisle noreply at blender.org
Wed May 5 05:46:04 CEST 2021 

Revision: 8004
          https://developer.blender.org/rBM8004
Author:   Blendify
Date:     2021-05-05 05:46:04 +0200 (Wed, 05 May 2021)
Log Message:
-----------
Merge branch 'blender-v2.93-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/advanced/scripting/security.rst
    trunk/blender_docs/manual/compositing/types/color/bright_contrast.rst
    trunk/blender_docs/manual/editors/graph_editor/fcurves/sidebar/modifiers.rst
    trunk/blender_docs/manual/editors/preferences/system.rst
    trunk/blender_docs/manual/files/data_blocks.rst
    trunk/blender_docs/manual/files/linked_libraries/library_overrides.rst
    trunk/blender_docs/manual/grease_pencil/modifiers/generate/index.rst
    trunk/blender_docs/manual/grease_pencil/primitives.rst
    trunk/blender_docs/manual/modeling/geometry_nodes/attribute/attribute_randomize.rst
    trunk/blender_docs/manual/modeling/geometry_nodes/attribute/attribute_vector_math.rst
    trunk/blender_docs/manual/modeling/geometry_nodes/attribute/index.rst
    trunk/blender_docs/manual/modeling/geometry_nodes/attributes_reference.rst
    trunk/blender_docs/manual/modeling/geometry_nodes/geometry/index.rst
    trunk/blender_docs/manual/modeling/modifiers/generate/multiresolution.rst
    trunk/blender_docs/manual/modeling/modifiers/generate/subdivision_surface.rst
    trunk/blender_docs/manual/modeling/point_cloud.rst
    trunk/blender_docs/manual/render/cycles/light_settings.rst
    trunk/blender_docs/manual/render/eevee/render_settings/shadows.rst
    trunk/blender_docs/manual/render/lights/light_object.rst
    trunk/blender_docs/manual/render/materials/index.rst
    trunk/blender_docs/manual/render/shader_nodes/converter/vector_math.rst
    trunk/blender_docs/manual/render/shader_nodes/shader/hair.rst
    trunk/blender_docs/manual/render/shader_nodes/textures/gradient.rst
    trunk/blender_docs/manual/render/shader_nodes/textures/ies.rst
    trunk/blender_docs/manual/render/shader_nodes/textures/musgrave.rst
    trunk/blender_docs/manual/render/shader_nodes/textures/point_density.rst
    trunk/blender_docs/manual/render/shader_nodes/textures/sky.rst
    trunk/blender_docs/manual/render/shader_nodes/textures/voronoi.rst
    trunk/blender_docs/manual/scene_layout/collections/properties.rst
    trunk/blender_docs/manual/scene_layout/object/properties/index.rst
    trunk/blender_docs/manual/sculpt_paint/sculpting/tool_settings/dyntopo.rst
    trunk/blender_docs/manual/video_editing/sequencer/strips/text.rst

Added Paths:
-----------
    trunk/blender_docs/manual/grease_pencil/modifiers/generate/line_art.rst
    trunk/blender_docs/manual/images/grease-pencil_modifiers_generate_line-art_baking-panel.png
    trunk/blender_docs/manual/images/grease-pencil_modifiers_generate_line-art_chaining-panel.png
    trunk/blender_docs/manual/images/grease-pencil_modifiers_generate_line-art_occlusion-panel.png
    trunk/blender_docs/manual/images/grease-pencil_modifiers_generate_line-art_panel.png
    trunk/blender_docs/manual/images/grease-pencil_modifiers_generate_line-art_style-panel.png
    trunk/blender_docs/manual/images/grease-pencil_modifiers_generate_line-art_transparency-mask.png
    trunk/blender_docs/manual/images/grease-pencil_modifiers_generate_line-art_vertex-weight-panel.png
    trunk/blender_docs/manual/images/modeling_geometry-nodes_attribute-reference_search.png
    trunk/blender_docs/manual/images/modeling_geometry-nodes_attribute_attribute-map_example.png
    trunk/blender_docs/manual/images/modeling_geometry-nodes_attribute_attribute-map_node.png
    trunk/blender_docs/manual/images/modeling_geometry-nodes_geometry_bounding-box_example.png
    trunk/blender_docs/manual/images/modeling_geometry-nodes_geometry_bounding-box_node.png
    trunk/blender_docs/manual/images/render_materials_line-art_panel.png
    trunk/blender_docs/manual/images/scene-layout_object_properties_line-art_panel.png
    trunk/blender_docs/manual/modeling/geometry_nodes/attribute/attribute_map_range.rst
    trunk/blender_docs/manual/modeling/geometry_nodes/geometry/bounding_box.rst
    trunk/blender_docs/manual/render/materials/line_art.rst
    trunk/blender_docs/manual/scene_layout/object/properties/line_art.rst

Removed Paths:
-------------
    trunk/blender_docs/manual/grease_pencil/modifiers/generate/lineart.rst
    trunk/blender_docs/manual/images/grease-pencil_modifiers_generate_lineart_baking_panel.png
    trunk/blender_docs/manual/images/grease-pencil_modifiers_generate_lineart_chaining_panel.png
    trunk/blender_docs/manual/images/grease-pencil_modifiers_generate_lineart_occlusion_panel.png
    trunk/blender_docs/manual/images/grease-pencil_modifiers_generate_lineart_panel.png
    trunk/blender_docs/manual/images/grease-pencil_modifiers_generate_lineart_style_panel.png
    trunk/blender_docs/manual/images/grease-pencil_modifiers_generate_lineart_transparency_mask.png
    trunk/blender_docs/manual/images/grease-pencil_modifiers_generate_lineart_vertex_weight_panel.png
    trunk/blender_docs/manual/images/render_materials_lineart.png
    trunk/blender_docs/manual/images/scene-layout_object_properties_lineart_panel.png
    trunk/blender_docs/manual/render/materials/lineart.rst
    trunk/blender_docs/manual/scene_layout/object/properties/lineart.rst

Property Changed:
----------------
    trunk/blender_docs/

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2021-05-04 14:21:48 UTC (rev 8003)
+++ trunk/blender_docs	2021-05-05 03:46:04 UTC (rev 8004)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,2 ##
 /branches/blender-2.92-release/blender_docs:7610-7921
-/branches/blender-2.93-release/blender_docs:7959-7989
\ No newline at end of property
+/branches/blender-2.93-release/blender_docs:7959-8003
\ No newline at end of property
Modified: trunk/blender_docs/manual/advanced/scripting/security.rst
===================================================================
--- trunk/blender_docs/manual/advanced/scripting/security.rst	2021-05-04 14:21:48 UTC (rev 8003)
+++ trunk/blender_docs/manual/advanced/scripting/security.rst	2021-05-05 03:46:04 UTC (rev 8004)
@@ -6,9 +6,7 @@
 The ability to include Python scripts within blend-files is valuable for advanced tasks
 such as rigging and automation. However, it poses a security risk since
 Python does not restrict what a script can do.
-
 Therefore, you should only run scripts from sources you know and trust.
-
 Automatic execution is disabled by default,
 however, some blend-files need this to function properly.
 
@@ -53,7 +51,6 @@
 
 First of all, the File Browser has the option **Trusted Source** which you can use on
 a case-by-case basis to control auto execution.
-
 However, you may forget to set this,
 or open a file without going through the File Browser --
 so you can change the default (described next).
@@ -63,10 +60,8 @@
 ----------------
 
 In the Preferences, there is the toggle to :ref:`Auto Run Python Scripts <prefs-auto-execution>`.
-
 This means the **Trusted Source** option in the File Browser will be enabled by default,
 and scripts can run when blend-files are loaded without using the File Browser.
-
 Once enabled you have the option to exclude certain directories,
 a typical configuration would be to trust all paths except for the download directory.
 
@@ -80,7 +75,6 @@
 
 You may want to perform batch rendering or some other task from the command line --
 running Blender without an interface.
-
 In this case, the Preferences are still used but you may want to override them:
 
 - Enable with ``-y`` or ``--enable-autoexec``

Modified: trunk/blender_docs/manual/compositing/types/color/bright_contrast.rst
===================================================================
--- trunk/blender_docs/manual/compositing/types/color/bright_contrast.rst	2021-05-04 14:21:48 UTC (rev 8003)
+++ trunk/blender_docs/manual/compositing/types/color/bright_contrast.rst	2021-05-05 03:46:04 UTC (rev 8004)
@@ -61,7 +61,7 @@
 Either of these nodes will scale the values back to normal range.
 In the example image, we want to amp up the specular pass.
 The bottom thread shows what happens if we do not clamp the values;
-the specular pass has valued much less than one in the dark areas;
+the specular pass has a value much less than one in the dark areas;
 when added to the medium gray, it makes black. Passing the brightened image through either
 the Map Value or the Color Ramp node produces the desired effect.
 

Modified: trunk/blender_docs/manual/editors/graph_editor/fcurves/sidebar/modifiers.rst
===================================================================
--- trunk/blender_docs/manual/editors/graph_editor/fcurves/sidebar/modifiers.rst	2021-05-04 14:21:48 UTC (rev 8003)
+++ trunk/blender_docs/manual/editors/graph_editor/fcurves/sidebar/modifiers.rst	2021-05-05 03:46:04 UTC (rev 8004)
@@ -15,12 +15,12 @@
 
 F-Curve modifiers are similar to object modifiers, in that they add non-destructive effects,
 that can be adjusted at any time, and layered to create more complex effects.
-Like object modifiers, F-Curve modifiers are evaluated from the top down.
+Like object modifiers, F-curve modifiers are evaluated from the top down.
 In other words, the top modifier is calculated first and consequent modifiers are calculated in order.
 Modifiers can be moved by dragging the modifier box from the top right.
 
-Modifiers can be muted or hidden by toggling the checkbox in the modifier's header region.
-Modifiers can be removed using the delete button in the modifier's header region.
+Modifiers can be muted or hidden by toggling the checkbox in the modifier's panel header.
+They can be removed using the delete button in the modifier's panel header.
 
 
 Adding a Modifier
@@ -44,7 +44,7 @@
 Generator Modifier
 ------------------
 
-Generator creates Polynomial function.
+Generator creates a polynomial function.
 These are basic mathematical formulas that represent lines, parabolas,
 and other more complex curves, depending on the values used.
 
@@ -51,7 +51,7 @@
 Mode
    Method used to represent the equation.
 
-   :Expanded Polynomial:  Equation in the form :math:`y = x^1 + x^2 + ... + x^n`.
+   :Expanded Polynomial:   Equation in the form :math:`y = x^1 + x^2 + ... + x^n`.
    :Factorized Polynomial: Equation in the form :math:`y = (Ax + B)(Cx + D)`.
 
 Additive
@@ -69,7 +69,7 @@
       for more information on polynomials.
 
 Influence
-   Controls the percentage of affect the modifier has on the F-Curve.
+   Controls the percentage of affect the modifier has on the F-curve.
 
 
 Restrict Frame Range
@@ -76,9 +76,9 @@
 ^^^^^^^^^^^^^^^^^^^^
 
 Start/End
-   The frame the modifier's affect starts/ends
+   The frame the modifier's affect starts/ends.
 Blend In, Out
-   The number of frames, relative the the start/end values above, the modifier takes to fade in/out.
+   The number of frames, relative the start/end values above, the modifier takes to fade in/out.
 
 
 .. index:: F-Curve Modifiers; Built-in Function Modifier
@@ -113,7 +113,7 @@
    Adjusts the Y offset.
 
 Influence
-   Controls the percentage of affect the modifier has on the F-Curve.
+   Controls the percentage of affect the modifier has on the F-curve.
 
 
 Restrict Frame Range
@@ -120,9 +120,9 @@
 ^^^^^^^^^^^^^^^^^^^^
 
 Start/End
-   The frame the modifier's affect starts/ends
+   The frame the modifier's affect starts/ends.
 Blend In, Out
-   The number of frames, relative the the start/end values above, the modifier takes to fade in/out.
+   The number of frames, relative the start/end values above, the modifier takes to fade in/out.
 
 
 .. index:: F-Curve Modifiers; Envelope Modifier
@@ -153,7 +153,7 @@
       Specifies the upper control point's position.
 
 Influence
-   Controls the percentage of affect the modifier has on the F-Curve.
+   Controls the percentage of affect the modifier has on the F-curve.
 
 
 Restrict Frame Range
@@ -160,9 +160,9 @@
 ^^^^^^^^^^^^^^^^^^^^
 
 Start/End
-   The frame the modifier's affect starts/ends
+   The frame the modifier's affect starts/ends.
 Blend In, Out
-   The number of frames, relative the the start/end values above, the modifier takes to fade in/out.
+   The number of frames, relative the start/end values above, the modifier takes to fade in/out.
 
 
 .. index:: F-Curve Modifiers; Cycles Modifier
@@ -191,7 +191,7 @@
    Set the number of times to cycle the data. A value of 0 cycles the data infinitely.
 
 Influence
-   Controls the percentage of affect the modifier has on the F-Curve.
+   Controls the percentage of affect the modifier has on the F-curve.
 
 
 Restrict Frame Range
@@ -198,9 +198,9 @@
 ^^^^^^^^^^^^^^^^^^^^
 
 Start/End
-   The frame the modifier's affect starts/ends
+   The frame the modifier's affect starts/ends.
 Blend In, Out
-   The number of frames, relative the the start/end values above, the modifier takes to fade in/out.
+   The number of frames, relative the start/end values above, the modifier takes to fade in/out.
 
 
 Trivially Cyclic Curves
@@ -245,7 +245,7 @@
    Adjusts how detailed the noise function is.
 
 Influence
-   Controls the percentage of affect the modifier has on the F-Curve.
+   Controls the percentage of affect the modifier has on the F-curve.
 
 
 Restrict Frame Range
@@ -252,9 +252,9 @@
 ^^^^^^^^^^^^^^^^^^^^
 
 Start/End
-   The frame the modifier's affect starts/ends
+   The frame the modifier's affect starts/ends.
 Blend In, Out
-   The number of frames, relative the the start/end values above, the modifier takes to fade in/out.
+   The number of frames, relative the start/end values above, the modifier takes to fade in/out.
 
 
 .. index:: F-Curve Modifiers; Limits Modifier
@@ -271,7 +271,7 @@
    Truncates the curve values to a range.
 
 Influence
-   Controls the percentage of affect the modifier has on the F-Curve.
+   Controls the percentage of affect the modifier has on the F-curve.
 
 
 Restrict Frame Range
@@ -278,9 +278,9 @@
 ^^^^^^^^^^^^^^^^^^^^
 
 Start/End
-   The frame the modifier's affect starts/ends
+   The frame the modifier's affect starts/ends.
 Blend In, Out
-   The number of frames, relative the the start/end values above, the modifier takes to fade in/out.
+   The number of frames, relative the start/end values above, the modifier takes to fade in/out.
 
 
 .. index:: F-Curve Modifiers; Stepped Interpolation Modifier
@@ -302,7 +302,7 @@
    Restrict modifier to only act after its "start" frame.
 
 Influence
-   Controls the percentage of affect the modifier has on the F-Curve.
+   Controls the percentage of affect the modifier has on the F-curve.
 
 
 Restrict Frame Range
@@ -309,6 +309,6 @@
 ^^^^^^^^^^^^^^^^^^^^
 
 Start/End
-   The frame the modifier's affect starts/ends
+   The frame the modifier's affect starts/ends.
 Blend In, Out
-   The number of frames, relative the the start/end values above, the modifier takes to fade in/out.
+   The number of frames, relative the start/end values above, the modifier takes to fade in/out.

Modified: trunk/blender_docs/manual/editors/preferences/system.rst
===================================================================
--- trunk/blender_docs/manual/editors/preferences/system.rst	2021-05-04 14:21:48 UTC (rev 8003)
+++ trunk/blender_docs/manual/editors/preferences/system.rst	2021-05-05 03:46:04 UTC (rev 8004)
@@ -95,9 +95,9 @@
    Upper limit of the Video Sequencer and Movie Clip Editor memory cache (in megabytes).
    For an optimal Clip editor and Sequencer performance, high values are recommended.
 Use Disk Cache
-   Writes cached strips to disk which can store a lot more than
-   to use Disk Cache, this option must be enabled,

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-docboard-svn mailing list