Skip to content

Commit

Permalink
Text updates
Browse files Browse the repository at this point in the history
  • Loading branch information
paulmelis committed Nov 27, 2023
1 parent 0945499 commit 34cb831
Show file tree
Hide file tree
Showing 9 changed files with 103 additions and 101 deletions.
6 changes: 5 additions & 1 deletion advanced/introduction/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2564,6 +2564,10 @@


<h1 id="introduction">Introduction<a class="headerlink" href="#introduction" title="Permanent link">&para;</a></h1>
<div class="admonition warning">
<p class="admonition-title">Warning</p>
<p>The material in the Advanced module is being updated for Blender 3.6</p>
</div>
<p>The Advanced part of the course consists of a number of separate topics, each with a number of assignments:</p>
<ul>
<li><a href="../python_scripting/1_api_basics/">Python scripting</a> for performing all kinds of using code</li>
Expand All @@ -2579,7 +2583,7 @@ <h1 id="introduction">Introduction<a class="headerlink" href="#introduction" tit
<small>

Last update:
<span class="git-revision-date-localized-plugin git-revision-date-localized-plugin-datetime">November 20, 2023 14:59:08</span>
<span class="git-revision-date-localized-plugin git-revision-date-localized-plugin-datetime">November 27, 2023 09:44:40</span>


&bull;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2696,8 +2696,8 @@ <h2 id="viewpoints">Viewpoints<a class="headerlink" href="#viewpoints" title="Pe
<ol>
<li>
<p>Load <strong><code>motorbike.blend</code></strong></p>
<div class="admonition hint">
<p class="admonition-title">Hint</p>
<div class="admonition tip">
<p class="admonition-title">Tip</p>
<p>This file will be in the <a href="../../../overview/setup/#data-files">data share</a> under <strong><code>data/basics/blender_basics</code></strong></p>
</div>
</li>
Expand Down Expand Up @@ -2774,7 +2774,7 @@ <h2 id="outliner-selection">Outliner selection<a class="headerlink" href="#outli
<small>

Last update:
<span class="git-revision-date-localized-plugin git-revision-date-localized-plugin-datetime">November 20, 2023 13:38:17</span>
<span class="git-revision-date-localized-plugin git-revision-date-localized-plugin-datetime">November 27, 2023 09:44:40</span>


&bull;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2678,8 +2678,8 @@


<h1 id="transformations">💻 Transformations<a class="headerlink" href="#transformations" title="Permanent link">&para;</a></h1>
<div class="admonition hint">
<p class="admonition-title">Hint</p>
<div class="admonition tip">
<p class="admonition-title">Tip</p>
<ul>
<li>You can clear an object's translation to all zero with <strong><code>Alt-G</code></strong></li>
</ul>
Expand Down Expand Up @@ -2781,8 +2781,8 @@ <h2 id="pivot-point-modes">Pivot point modes<a class="headerlink" href="#pivot-p
</li>
</ol>
<h2 id="rubiks-cube">Rubik's cube<a class="headerlink" href="#rubiks-cube" title="Permanent link">&para;</a></h2>
<div class="admonition hint">
<p class="admonition-title">Hint</p>
<div class="admonition tip">
<p class="admonition-title">Tip</p>
<ul>
<li>You can add a cube object with <strong><code>Shift-A &gt; Mesh &gt; Cube</code></strong></li>
<li>You can duplicate selected objects with <strong><code>Shift-D</code></strong>. This will also activate
Expand Down Expand Up @@ -2823,7 +2823,7 @@ <h2 id="bonus-2001-a-space-odyssey">Bonus: 2001 - A Space Odyssey<a class="heade
<small>

Last update:
<span class="git-revision-date-localized-plugin git-revision-date-localized-plugin-datetime">November 20, 2023 13:38:17</span>
<span class="git-revision-date-localized-plugin git-revision-date-localized-plugin-datetime">November 27, 2023 09:44:40</span>


&bull;
Expand Down
18 changes: 8 additions & 10 deletions basics/blender_fundamentals/avoiding_data_loss/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2808,16 +2808,16 @@ <h2 id="unused-data-blocks-in-the-scene-are-not-saved">Unused data-blocks in the
of Blender is somewhat controversial, and it is definitely good to be aware of this behaviour. </p>
<p>For most scene elements used in the Basics part of this course garbage-collection-on-save does not really cause concern, except for the case
of Materials (as described in the example above). For materials, and other scene elements, you can see if they are unused by checking for a <strong><code>0</code></strong>
next to their name when they appear in a list:</p>
left of their name when they appear in a list:</p>
<p><img alt="" src="../../images/unused-material.png" /></p>
<p>The quick fix in case you have a material that is currently not used in the scene, but
that you definitely want to have saved to file, is to use the "Fake User" option by clicking the shield icon (<strong>be sure to enable this option
for the right material!</strong>):</p>
<p><img alt="" src="../../images/fake-user-setting.png" /></p>
<p>You can verify the material now has a fake user as intended by checking for an <strong><code>F</code></strong> next to its name:</p>
<p>You can verify the material now has a fake user as intended by checking for an <strong><code>F</code></strong> left of its name:</p>
<p><img alt="" src="../../images/material-with-fake-user.png" /></p>
<p>Note that you can use the same Fake User option for some other types of scene elements as well.</p>
<p>We have a more detailed discussion of the garbage collection system in a <a href="../../../api/10000_foot_view/#data-block-users-and-garbage-collection">section</a> in the Python scripting reference. The behaviour described relates to the data block system that Blender uses internally and for normal use the description above should be sufficient, but can also be influenced from Python.</p>
<p>We have a more detailed discussion of the garbage collection system in a <a href="../../../api/data_block_users_and_gc/">section</a> in the Python scripting reference. The behaviour described relates to the data block system that Blender uses internally and for normal use the description above should be sufficient, but can also be influenced from Python.</p>
<h2 id="recovering-lost-work">Recovering lost work<a class="headerlink" href="#recovering-lost-work" title="Permanent link">&para;</a></h2>
<p>Murphy's Law usually strikes when you least expect it. Fortunately, there are several layers of defense in
case something goes unexpectedly wrong when saving files, or in case Blender crashes.
Expand All @@ -2830,13 +2830,11 @@ <h3 id="those-blend1-files">Those .blend1 files?<a class="headerlink" href="#tho
the existing <strong><code>file.blend</code></strong> to <strong><code>file.blend1</code></strong>, and only then saves the new <strong><code>file.blend</code></strong>. </p>
<p>So if you accidentally overwrite a file you can still get to the previous version (the .blend1 file), <strong>as long as you haven't overwritten more than once</strong>.</p>
<div class="admonition tip">
<p class="admonition-title">More than 1 previous version</p>
<p>You can actually have multiple previous versions kept around if you like. The preference setting for this is <strong><code>Save &amp; Load &gt; Save Versions</code></strong>,
which defaults to 1. If you would increase it then files with extensions .blend2, .blend3 and so on would be kept around.</p>
<p class="admonition-title">Keeping more than 1 previous version</p>
<p>You can actually have multiple previous versions kept around if you like. The preference setting for this is <strong><code>Save &amp; Load &gt; Blend Files &gt; Save Versions</code></strong>, which defaults to 1. If you would increase it then files with extensions .blend2, .blend3 and so on would be kept around.</p>
</div>
<h3 id="auto-save">Auto save<a class="headerlink" href="#auto-save" title="Permanent link">&para;</a></h3>
<p>By default, Blender will automatically save your current scene to a file in a temporary directory every few minutes (2 minutes by default). The settings
that control this are <strong><code>Save &amp; Load &gt; Auto Save</code></strong> and <strong><code>Save &amp; Load &gt; Auto Save &gt; Timer (Minutes)</code></strong>. </p>
<p>By default, Blender will automatically save your current scene to a file in a temporary directory every few minutes (2 minutes by default). The settings that control this are under <strong><code>Save &amp; Load &gt; Blend Files</code></strong>, specifically the checkbox on <strong><code>Auto Save</code></strong> to enable auto-save and the <strong><code>Timer (Minutes)</code></strong> setting under <strong><code>Auto Save</code></strong>. </p>
<p>This auto-save file is stored in your system's
<a href="https://docs.blender.org/manual/en/latest/advanced/blender_directory_layout.html#temporary-directory">temporary directory</a>, and uses the process ID of Blender in the file name, as well as the string <strong><code>_autosave</code></strong>. Here is an example
from a Linux system, where <strong><code>/tmp</code></strong> is used and Blender's process ID is 66597:</p>
Expand All @@ -2853,7 +2851,7 @@ <h3 id="auto-save">Auto save<a class="headerlink" href="#auto-save" title="Perma
<p>If you happend to be in edit (or sculpt) mode at the time Blender does an auto-save, then the current updated state of the mesh will not get saved. This is a limitation of the auto-save feature.</p>
</div>
<h3 id="last-session-accidental-quit-without-saving">Last session (accidental quit without saving)<a class="headerlink" href="#last-session-accidental-quit-without-saving" title="Permanent link">&para;</a></h3>
<p>Whenever Blender quits normally (i.e. not a crash) it will save the current session state to a file called <strong><code>quit.blend</code></strong> in your system's temporary directory.
<p>Whenever Blender quits <strong>normally</strong> (i.e. not a crash) it will save the current session state to a file called <strong><code>quit.blend</code></strong> in your system's temporary directory.
You can easily load this file with the <strong><code>File &gt; Recover &gt; Last Session</code></strong> option (or copy it to a different location and load it as any Blender file).</p>
<p>One of the cases where this feature might come in handy is if you quit Blender, have unsaved changed, but accidentally click the <strong><code>Don't Save</code></strong> button in the
<code>Save changes before closing?</code> dialog. <strong>The <code>quit.blend</code> file in this case will contain those unsaved changes</strong>. But be sure to make a copy of it before quitting Blender again, as that will overwrite it.</p>
Expand All @@ -2870,7 +2868,7 @@ <h3 id="blender-crash">Blender crash<a class="headerlink" href="#blender-crash"
<small>

Last update:
<span class="git-revision-date-localized-plugin git-revision-date-localized-plugin-datetime">November 20, 2023 13:38:17</span>
<span class="git-revision-date-localized-plugin git-revision-date-localized-plugin-datetime">November 27, 2023 09:44:40</span>


&bull;
Expand Down
14 changes: 7 additions & 7 deletions basics/blender_fundamentals/first_steps/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2690,8 +2690,8 @@


<h1 id="first-steps-in-the-user-interface">First steps in the user interface<a class="headerlink" href="#first-steps-in-the-user-interface" title="Permanent link">&para;</a></h1>
<div class="admonition hint">
<p class="admonition-title">Hint</p>
<div class="admonition tip">
<p class="admonition-title">Tip</p>
<p>A lot of new concepts and UI elements will be introduced in the upcoming videos. It probably works best to watch video(s) limited to a certain
topic, try the operations shown and corresponding exercise(s) in Blender yourself, before moving on to the next topic.</p>
</div>
Expand All @@ -2716,14 +2716,14 @@ <h2 id="user-interface-fundamentals">User interface fundamentals<a class="header
and changing the set of selected objects. We also look a bit closer into keyboard shortcuts and menus.</p>
<p>It's probably best to follow along in Blender on your own system while viewing the video. The files
used in the video can be found under <strong><code>data/blender_basics</code></strong>.</p>
<div class="admonition hint">
<div class="admonition tip">
<p class="admonition-title">Slow 3D interaction</p>
<p>If the interaction in the 3D view isn't smooth (as seen in the video) on your PC/laptop something might be wrong in the setup of your system.
Please contact us if this appears to be the case.</p>
</div>
<iframe width="800" height="450" src="https://www.youtube-nocookie.com/embed/GiHDcvoP60s" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>

<div class="admonition hint">
<div class="admonition tip">
<p class="admonition-title">Accidental 'Edit mode'</p>
<p>If the 3D view (or some of the other areas) suddenly appear to behave strangely, or you now
see your mesh with all kinds of dots or lines then you might have accidentally entered the so-called
Expand All @@ -2734,7 +2734,7 @@ <h2 id="user-interface-fundamentals">User interface fundamentals<a class="header
in one of the exercises). You can use the drop-down menu shown above (or the <strong><code>Ctrl-Tab</code></strong> menu in the 3D view) and
pick <strong><code>Object Mode</code></strong> to get back to the correct mode. </p>
</div>
<div class="admonition hint">
<div class="admonition tip">
<p class="admonition-title">Accidental workspace switch</p>
<p>Another thing that might happen is that you accidentally click one of the tabs at the top of the screen, which then
completely changes the layout of your user interface. These tabs are used to switch between workspaces, where each workspace
Expand Down Expand Up @@ -2778,7 +2778,7 @@ <h2 id="changes-to-default-preference-settings">Changes to default preference se
<li>In case you find that Blender's user interface elements, such as buttons or menu text, are too small you can scale up the UI with a single
setting under <strong><code>Display &gt; Resolution Scale</code></strong>. If you change the value you can see the changes in the UI immediately.</li>
</ul>
<div class="admonition hint">
<div class="admonition tip">
<p class="admonition-title">Orbit around selection</p>
<p>Another option which you might consider enabling is <strong><code>Orbit Around Selection</code></strong>. By default this is turned <strong>off</strong> and in that mode any rotation of the 3D viewport will be around the center of the view, which might cause selected objects to go out of view. When the option is turned <strong>on</strong> viewport rotation will be around the selected object(s), always keeping them in view. You can find this option on the <strong><code>Navigation</code></strong> tab under <strong><code>Orbit &amp; Pan</code></strong>.</p>
</div>
Expand All @@ -2788,7 +2788,7 @@ <h2 id="changes-to-default-preference-settings">Changes to default preference se
<small>

Last update:
<span class="git-revision-date-localized-plugin git-revision-date-localized-plugin-datetime">September 26, 2023 13:42:33</span>
<span class="git-revision-date-localized-plugin git-revision-date-localized-plugin-datetime">November 27, 2023 09:44:40</span>


&bull;
Expand Down
6 changes: 3 additions & 3 deletions overview/support/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2574,9 +2574,9 @@ <h1 id="support">Support<a class="headerlink" href="#support" title="Permanent l
with one of <a href="../about/">us</a>.</p>
<p><img alt="" src="../../images/discord-help.png" /></p>
<p>Depending on the course you're following (basics or advanced) you need to use the category called
<strong><code>BASICS BLENDER COURSE</code></strong> or <strong><code>ADVANCED BLENDER COURSE</code></strong>. Within these categories you will find:</p>
<strong><code>BASICS BLENDER COURSE</code></strong> or <strong><code>ADVANCED BLENDER COURSE</code></strong>. Within these categories you will find two support channels:</p>
<ul>
<li>A shared text chat channel (e.g. <strong><code>2022-04-blender-basics-chat</code></strong>) for interacting with the course teachers
<li>A shared text chat channel (e.g. <strong><code>2023-12-blender-basics</code></strong>) for interacting with the course teachers
and other course participants. Here you can ask questions, show your work, or anything else you feel like sharing.</li>
<li>A video channel (<strong><code>video channel</code></strong>), in case we want to share something through Discord</li>
</ul>
Expand All @@ -2588,7 +2588,7 @@ <h1 id="support">Support<a class="headerlink" href="#support" title="Permanent l
<small>

Last update:
<span class="git-revision-date-localized-plugin git-revision-date-localized-plugin-datetime">November 20, 2023 13:38:17</span>
<span class="git-revision-date-localized-plugin git-revision-date-localized-plugin-datetime">November 27, 2023 09:44:40</span>


&bull;
Expand Down
2 changes: 1 addition & 1 deletion search/search_index.json

Large diffs are not rendered by default.

Loading

0 comments on commit 34cb831

Please sign in to comment.