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

Aaron Carlisle noreply at blender.org
Mon Jan 25 19:49:00 CET 2021


Revision: 7664
          https://developer.blender.org/rBM7664
Author:   Blendify
Date:     2021-01-25 19:49:00 +0100 (Mon, 25 Jan 2021)
Log Message:
-----------
Merge branch 'blender-v2.92-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/conf.py
    trunk/blender_docs/manual/grease_pencil/materials/grease_pencil_shader.rst
    trunk/blender_docs/manual/images/interface_controls_nodes_groups_example.png
    trunk/blender_docs/manual/images/interface_controls_nodes_groups_interface-panel.png
    trunk/blender_docs/resources/theme/js/version_switch.js

Removed Paths:
-------------
    trunk/blender_docs/resources/versions.json

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2021-01-25 18:47:35 UTC (rev 7663)
+++ trunk/blender_docs	2021-01-25 18:49:00 UTC (rev 7664)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/branches/blender-2.92-release/blender_docs:7610-7658
\ No newline at end of property
+/branches/blender-2.92-release/blender_docs:7610-7663
\ No newline at end of property
Modified: trunk/blender_docs/manual/conf.py
===================================================================
--- trunk/blender_docs/manual/conf.py	2021-01-25 18:47:35 UTC (rev 7663)
+++ trunk/blender_docs/manual/conf.py	2021-01-25 18:49:00 UTC (rev 7664)
@@ -235,7 +235,7 @@
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
 # directly to the root of the documentation.
-html_extra_path = ["../resources/versions.json"]
+# html_extra_path = []
 
 # If not None, a 'Last updated on:' timestamp is inserted at every page
 # bottom, using the given strftime format.

Modified: trunk/blender_docs/manual/grease_pencil/materials/grease_pencil_shader.rst
===================================================================
--- trunk/blender_docs/manual/grease_pencil/materials/grease_pencil_shader.rst	2021-01-25 18:47:35 UTC (rev 7663)
+++ trunk/blender_docs/manual/grease_pencil/materials/grease_pencil_shader.rst	2021-01-25 18:49:00 UTC (rev 7664)
@@ -92,6 +92,9 @@
    Fixed
       Aligns to the screen space; ignoring the drawing path and the object's rotation.
 
+Rotation
+	Rotates the points of *Dot* and *Square* strokes.
+
 Self Overlap
    Disables stencil and overlap self-intersections with alpha materials.
 

Modified: trunk/blender_docs/manual/images/interface_controls_nodes_groups_example.png
===================================================================
(Binary files differ)

Modified: trunk/blender_docs/manual/images/interface_controls_nodes_groups_interface-panel.png
===================================================================
--- trunk/blender_docs/manual/images/interface_controls_nodes_groups_interface-panel.png	2021-01-25 18:47:35 UTC (rev 7663)
+++ trunk/blender_docs/manual/images/interface_controls_nodes_groups_interface-panel.png	2021-01-25 18:49:00 UTC (rev 7664)
@@ -1,75 +1,149 @@
 \x89PNG
 
    
-IHDR   \xF8  g   \xF4~   gAMA  \xB1\x8F\xFCa   sRGB \xAE\xCE\xE9   	pHYs  t  t\xDEfx  +7IDATx\xDA흇WTI\xFA\xF7\xF7\xDFس\xBB\x93\xF6]\xDDى\xEA8?tPלdP@DE$H\x90$ ("*
-b DA\x82\x88\x80\xC9Ar\x94\xB3g\xCF\xCE\xFCvߝ\xD90\xF9\xFD\xDA\xF5z\xB7\x9A\xA6\x9B\xD4
-\xFD\xFD\x9E{\xFAԭ[\xB7>\xF5\xD4S\xB7\x9B\xCB/\xD6P\x94\xE84E\xD0)\x8A\xA0SA\xA7(\x82NQ\x9D\xA2:Et\x8A\x9Aw\xA0oٲ\xC5\xDD\xDD=,,\xEC\xE8ѣ\xECEj\xB6A_\xBBvmBB\xC2_\xFE\xF2\x97u\xEB\xD6)/\xE6\xE3\xE3\xA1\xBC\x98\xCA\xFB\xFA\xFA\xFE\xFC\xE7?\xD7\xD5\xD5EFFN\xAE\x8A\xA0\xFFG/^L#d\x8EW̥\xA4\xA4\xFC\xEB_\xFFڼy\xB3\x92jQ\xEC\xF1\xE3\xC7MMM\x9B6m\x9A\xC4X:u\xEAԏ?\xFEheee``\xB0u\xEB\xD6\xF5\xEB׳#\xA9)\x81nll\8F\xC8TB0F@߶mvMMM---7l\xD8p\xF2\xE4\xC9\xE0\xE0``\x8A|\x93\x8A\x8A\x8A\x9E\x9Eggg{{\xFB}\xFB\xF6\x89s>\xE2\xEF\xEF\xFF\xF9矋\x92R%7nD%\x88UP&11\xF1\x87~ \xEEǎ۱cND\x85\xDE\xDE\xDE\xE7Νstt\xC5=\x8E\xDA\xDAڢڀ\x80\x80HՎw9J\xAB-\x93\xEA\xE9ɇ.\xF1\xF1\xF1\xF2\x94\x83c\xE5\xAEZ\xE8\xE4\xE7\xE7\xC3m\xBFx\xF1bdddhhn\xF8ʕ+ \xE1\xCD\xD7_\xFD\xED\xB7\xDF"spp\x99(_^^\xFE\xEF\xFF\xBB\xB3\xB3\x85\xFF\xF1\x8Fxzz\xA26\xA9\x92\x96\x96\x96/\xBF\xFCr
 xx8//\x89\x9F\xFEY\x9C{\xE8С\xABW\xAF\xFE\xF3\x9F\xFF\xEC\xED\xEDmooG%w\xEE\xDC)\xEEGT\xFB\xFD\xF7\xDF#\xD4\xE9\xEE\xEEF\xFD^^^\xA8\xF3\x80\xC2\xCB,\xDD}\x94SW\xE2\xCEG\x81\x8E4\xCA\xFF\xF4\xD3O111\x881v\xED\xDA\xF5\xF0\xE1C \x854\x9B\xA7O\x9F\xB6\xB6\xB6\xEEٳP\xA2pFF"\xFB#G\x8E\xE0\xE8\xEEݻ\xD3\xD3ӿ\xFA\xEA+\xA4\xA5Jnݺ\x85d\xBAp\xE1<:\xE6\xB8s\xC4\xEB\x98(\xF6\xEF\xDF/Y[[#vG\xE1\xB52effbD\xB9\xB9\xB9\x89s\xCD\xCC\xCC\xE0\xFB1\xD2P\xBF\xC2\xCB,\xAD9dR==\xA5Ũ\xE4ԕ\xBBs\x85\xA0\xFF\xE9OB` 7\xE2
-8u\xC4*f\xE0\x98:\xD8B\x98\xBE}\xFBvxb\8n\x95\xC9\xC8\xC8(#\x94\xA8.C\x95\xA00\xEA	\xC7Q \x8A\xDD
-2ᐡ\xA1!B\x87\xE2\xE2b\xCC!"w\x825\x83Z\xE2\\x84@\xA8\xE3M\xE1\xE5\xC0\xE8\xF4Sɩ+w\xE7
-Aoll\x84\xCF \xC1\xA1\xF4ӧO\xDF'O\x9E \xC6\xA1\xBC\x85\x85\xF2\xE1b\xFB\xFB\xFB\xFBdB\xE4]\xBBv
-\xBC\xA2\x8D\x88\xD0U\x85\x86\x86\xE2\xA8\x9F\x80o\x8C\xC4'\xFD\xEB_1\xAE\xBE\xF9曁\x810\x8D\xC8\xD5"p\xF1\xC1H(\xB9\xA3\xDD
-]$\xA7>\xA1;W:\x9C\xAB\xA0Y\xACAA\x98\x87\x87\xF0\x95\xDD\xDC\xDC\xF9w\xEF\xDEE\x8CqR&WWW\xA4\xC5TT\xAF/\x91*:\xAEL\x9F?\x8EQ$\xA4\xAC\xAC,\xC4\xEE\xF0Ӣ\xDA\xF3\xE7ϣ\xF9\x9BTr9>\xC0\xD1uЍe\x9A.\xD0A\xA2g\xAC\xC5!\xFB\xDB\xDFrss\xC1\xEE\xD6\xD7\xC2!xe\xE1\xD1\xE5+: \xEA
-
-B\xBC\x8E\xF2(\x86\xF5\xA5 \xD5\xC2ǣZ\xE9!\xA6\xF0\xEBJ.G\x8F\xAE\xD31\xBA\xEARt\xC4	b\x99O\x8Ch\xFB\xE6͛\xDF}\xF7\xC6%x\xC5Qd\xA2 \xF2\xC7V2
-t\x8C\xAC#KKK\xC53u,C\xC5\xC3\xF1|=11\xD5FEEa<\x80\xEF\xE3Ǐ\xB7=\xDE\xE5\x96N\xC7\xE8j\x81\x8E\xC5\x96z􂂂\xBA\xBA:y\xD0I\xBB\xBB\xBB\x83N\xAC+**\xFE\xFE\xF7\xBF\xFD;w\xEE Ĥ\xA4$\xA0\x82\x81 >\xDB\xDA\xDAPfl% =$$e\xA4\xD0%   \xF5|'Smm-B\xC4\xE8 %q\x96x\xA8\x97F\xFD...8\xF9
-/G \xBAJ[ \xC4\xD3\xA4\xB1
-\x8ER\xE4 W
-
-\xA6\x81\xD2H\xC0\x89\xC2;\xB8U|\xEEݻ\xF7\x98L\xA6\xA6\xA68Q\xC4\xA3*A\xB5(,\xA2\xE9\x8AFFFNNND\xBE\x88\xD4\xC5W\xB3\xB8
-\xAA\xC5Qggg\xA0\x8C\xDA\xD6ɤ\xF0r|\xEAB\xD0\xD5p\xEA Q\xAC\xEA\xE4\xD3B\xE2i\xA0\xE0	G\xA5G~>$ "OǫD\xB0.\xE5\x88\xDD-2\x89\x8E\xF2G\xC5UD \x8E\xF2WWx9\x8A\xA0φ־\xD6\xE4NT\xB7\xDAI_\x8E"\xE8E\xD0)\x8A\xA0SA\xA7(\x82NQ\x9D\xA2~\xF1?\xA5"\xE8A\xA7(\x82NQ\x9D\xA2:Et\x8A"\xE8E\xD0)\x8A\xA0S\x9D\xA2:E͖\xB6o\xDFnhh\xB8_M\xE1,\x82N\xCDMqytjn\xF8\xF2\xFDS\x93\x81\x81A\xA7\xE6\xB9;WũtJ\xF3\xDA?\x9AA\xD0\xF5eb?M\xA8e˖mݺ\x9D\xB1q\xE3F\xA4i\x90\xB9\xBA\x9E\x9E^JJJff&\xD3\xD5`Tu\xEEܹ'N\xCC'\xAC\xAC\xACJKK\xFB\xFB\xFB\xDB\xDA\xDArssw\xEF\xDE=sF\x98\x8B6\xD4j\xD0a\xC7\xFB\xF7\xEF\xE7\xE4\xE4\xACX\xB1b\xBA\xBC|\xF9rT\x8D\x89bǏejj\xDA\xDB\xDB{\xEB\xD6-\xAC\x966l؀\xFEx\xFC\xF8qss\xF3\x96-[f\xC8sц\xCA	\xB6\xB6\xB6>z\xF4(>5	:\xBAmժU0\xA8\xA7\xA7\xA7\x8D\x8D\x8D\xA3\xA3\xE3\xBD{\xF7\xCC\xCC\xCC\xF4d\xF9'O\x9E\x84\xFBGK\xF9~~~\xE6\xE6\xE6\x92\xF2\xF2\xF2:x𠓓S}}}QQ\xFA)22r\xE5ʕ۶m\xBBt\xE9.t\xF7\xEE\xDD\xE0\xE0`䠼ȟ\xCBӧO\xCB\xCB\xCB\x
 B1\xAC^\xBD\xB7\xFD\xC7?\xFEq׮]\x9D\x9D\x9Dqqq\x9F}\xF6\x99*F\x80y\xE7\xBD
-\x95\xE0kbb\xF5\xECٳ˗/#\xADa\xD0E\x8FVVV—!nlǎ"\xBF\xAE\xAE\xC5|}}1\x90oll\x8C\xFC\x8A\x8A\x8A\xB3g\xCF\xC2\xFD\x88\xAA
-
-
-\xC2\xC3\xC3\xED\xED\xEDkjjpJXX\xBA.\xF0ŋiiigΜ	HMMݼy\xB3\xE8ѡ\xA1!\xA0\xA3\xE5\xA0\xE3\xFEq\x9F$֮]+\x98 kcc#\xA0W\xC5k֬\x99\xF76\x8F]4\xD3\xD5յ\xBA\xBAzpppwwW\xC2\xFAl\x80[\xE7\xE7\xE7?\xFE\xAEK\xBC\xF2\xB7\xE2ᴐ#^T\xBB~\xFD\xFA\xEC\xECl\xB3*FE``\xA0X\xCB\xE2\xF4\xC2\xC2B\xF1\xEFK\xC2^\xBF~݃>022Bg\x88\xB7\xA4\x8B\xBF\xE5%\xB8.f\xB1\xC4\xC4DT\xA8\xE5\xA0\xC3\xF5\xBB\xB8\xB8'*\xD9-$$킕T1\xCC;\xEFm8嘠Ж\x9E\x9E\x9E\x91\x91o\xD83\xF25\xFA\x8D7`8\xC0\x8D~Eg\xC0\xD6H VF>L\xA7\xD2\xD0\xD0 g\x86N\x82\xBF\xF1\xBD\xE8$̳\xC8G\x85111H g\xC1\xF3a\xFC\xA0$Z\x82\xC2\xC2{\xA1*t\x98<=Z(xM\x80\xEE\xEC\xEC,\xFFlJ\xE0\xAAb\x9C;\xEFm\xA8\P~\xF5\xEA\xD5\xEE\xEEn\xD8\xA0\xE3ă\xB1\xF1\x82\xF5\xD9Q\xD2\xC2\xE8\x8F=B
-[#\xC4#!\xFA\xB3"T\x8C\x87Q\x9D\x84 Lģ\xA8\xF0ڵk\xA2\x90\xFF\xF9\xE7\x9F#Dä\xDC\xDFߏ\x8E\x84?\xF5\xE0\x90\xF6?U ʘs\xBA\x80*y\xBBa
-\xF8\x84GW\xC5\xF3ކc\xA9\xC5\xDA+\x8Cgx\x84\x91\xD7B\xBA\xA9\xA9\xC9\xDB\xDBG5	:\xAC)7##C=33S \x9C\x82U\xBC\xDCz\xF3\xAC\xE8$8\xAD\xE6\xE6f\xD1IYYYb*\x90գG\xC5󊶶6\xCC\xD4z\xAF\xA5\xFD\x8BQ\xB9G\xD1|!pL\xC1:\xAAA\xD8v~\xDBp,\xB5XR\xE7\xE5\xE5\x8D(\x96\x98$\xB5t8\xAC\x90\x90ihh\xD8\xD2҂\x89{\x8D\xEC\xDFܕ\x95\x95mڴ	4`\xD9χ\xFE\xC3\xE9\xD1\xC2m۶!\xBD}\xFBv\xCCS\xE8H\xA4e\xA2\x93|||P\xCF\xE1Ç1cL\xE3c͙{\xEA\x82\xF9nRR8\xC3.\xE8\xB0\xDC\xD2޽{aU\x8C l;\xBFm8\x96Zம.\x85\xA0#\x98i\xB3
-:\x96\xF0999tXVXY\x80\x9E\x9E\x9E+@\xBFw\xEF^UU\xFC\xCD\xC0\xC0\xC0\x830\xA1þ0:\Vh8(**\x827B>O%%%\xC8\xC7<ekk\x8BN(X\x8A\xE1\xF3\xEEݻ8\xFE\xE9̙3\xE8T\xB84\xEDw\xEAh\x91\x9D\x9D]ii)\xDAG\x8EO\x80njj*3\xAAM\x9E\xF76K\xADx\x9CzJ\x91\x90\x8FF\xCD\xEA7\xA3@\xF3/\xE0FL\xA3\xF3ĪK\xECˆ\xE2\x89Att4\x8Ckff7džC$\xE8f\xA4MLLA\xA2$\xD2b\xB1\x85\xC4?]\xC1\xA7\xA8m\xC0\xAA\x9E	\xD7\x8F2ї\xE2\xA8\xF6\x83S\xC0>h\xDAnii\xB9k\xD7.\xF1dDԮ\xA2\xE6\xBD
-\xB5\xFD\xB7.\xB0l*V\xF1\xE2\xF9\x80\xB4\xB8\x87\xC4L4\xE21\x84^\x97ʠKD&\x8C.
-\xE3\x90X$\x89\xA99\xA2\xFAC碌84'\xBE\xF6\xC3݊'Q\xA2"\x91\x8F\xE3\x95A<\xB9\x9A\xDF6\xD4v\xD0'̝\x9C\x9C,\x9E\x8C\xB7\xFAQeI4WV\x9F\x93n\x85\x92\xD6\xE9\x82
-\xE7<\xE8"\xBC\x91fj\x8A6\x9C\x9F\xA0\x8B=\xC4ߦ҆\xF3t\x8A"\xE8E\xD0)j\xFA41\xE8\xE2A\x95x>EQ*j\xD4ST%Z\xB2dɴxt\xD43y\xD0\xF5\xF5\xF5\x81\xF8'\x9F|\xF2\xD1G\xBDO\xFD\xB7Н4\xC2x3`]şh8t\xC1\x88Ľq\x82>i\x89\x9F\x87h;\xE8\x8E\x97\xEC-\x82>i-^\xBCX\xFE\x97\x9BZ
-:n\x91O\xDDJ\xDA:;\x92\xA0t\x8A\xA0t\x82Nt\x82N\xD0'=  \xA0\xA8\xA8\xA8\\x91\x8A\x8B\x8B\x83\x82\x82:A\x9F\xA0\xFB\xFA\xFA\xD6\xD6\xD6*\xFCS\xBA\xBA\xBA\xBA\xB3g\xCFt\x82>@\xB7\xB1\xB1\xB9v\xEDZOO\x8Fxׅ\x90x\xE3\xC5\xF5\xEB\xD7q\x94\xA0\xF4y\xA3\xDB\xD9\xD9\xE5\xE5\xE5\xF5\xF7\xF7K\xA0=zt\xC6\xE8~\xF8\xA1\xBE\xBE\xFE\x8E;V\xAE\\x89\xF4|\xA0\xA4\xF0\xA1C\x87\x8C\x8C\x8C\xE6\xE8\xDA\xDC.-\xDD\xD4\xD4\xD4\xC5ť\xB1\xB1Q\xBC\xDA\x9F---\xAE\xAE\xAEȟo\xA0\xEF޽\xFBɓ'haGGG___}}\xFD\xA9S\xA7\x94\x94\xF0\xE0\xC1\x85\xB4t-o\x97\x96\x80\x8E\xB1mnn\x8E\x86\xB7\xB6\xB6\xF4\xF6\xF6\xF6\xA8\xA8(\xE4k\xF4\xBC\xF9替\xFAկ~\xF9\xCB_\xFE\xE67\xBF\xC1\xEE
-d``\x80\x80,11q\xF5\xEA\xD5\xD8\xFD\xF8㏭\xAD\xAD\xD1\xE5st\xEDo\xD7\xF4\xF6\xECT/\x82i[[\xDB\xF4\xF4t\xF8\xF5\xCC\xCC\xCCÇ\x8F\xF7\xE2\xC5Y\xFD\xED\xB7߆!n\xDE|\xFBɓ\xEF"\x8B\xC0:S\xB1oNNNii\xE9\xA8\xDF \x88]L\xF4VVV\xF1\xF1\xF1\xC9\xC9\xC9\xFE\xFE\xFE\xB8\xD5Q@\x8CW\xE0ĉ\x98\xF8	ܺu\xCB\xC
 B\xCBK#\xA0k\xBB\xA6\xB7g\xA7\xFE\xAD\x8B\x8B\x8Bç\x86\x9F\xA3c\x88\xA3\xF1\xC2\xF24i\xBF\xBEl\xD92\xCC\xEC\xA7O\x9FV\xBC"t\xC3%""\xCA\xCA\xCA

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-docboard-svn mailing list