[Bf-docboard-svn] bf-manual: [8674] trunk/blender_docs/manual: Merge branch 'blender-3.0-release'
Aaron Carlisle
noreply at blender.org
Tue Nov 23 22:51:53 CET 2021
Revision: 8674
https://developer.blender.org/rBM8674
Author: Blendify
Date: 2021-11-23 22:51:53 +0100 (Tue, 23 Nov 2021)
Log Message:
-----------
Merge branch 'blender-3.0-release'
Modified Paths:
--------------
trunk/blender_docs/manual/addons/3d_view/index.rst
trunk/blender_docs/manual/addons/add_mesh/index.rst
trunk/blender_docs/manual/editors/preferences/save_load.rst
trunk/blender_docs/manual/grease_pencil/modifiers/generate/line_art.rst
trunk/blender_docs/manual/modeling/modifiers/generate/geometry_nodes.rst
trunk/blender_docs/manual/scene_layout/object/properties/display.rst
Added Paths:
-----------
trunk/blender_docs/manual/images/grease-pencil_modifiers_generate_line-art_composition-panel.png
Removed Paths:
-------------
trunk/blender_docs/manual/addons/3d_view/blenderkit.rst
trunk/blender_docs/manual/addons/add_mesh/archipack.rst
Property Changed:
----------------
trunk/blender_docs/
Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs 2021-11-23 21:49:35 UTC (rev 8673)
+++ trunk/blender_docs 2021-11-23 21:51:53 UTC (rev 8674)
Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
/branches/blender-2.92-release/blender_docs:7610-7921
/branches/blender-2.93-release/blender_docs:7959-8113
-/branches/blender-3.0-release/blender_docs:8543-8666
\ No newline at end of property
+/branches/blender-3.0-release/blender_docs:8543-8673
\ No newline at end of property
Deleted: trunk/blender_docs/manual/addons/3d_view/blenderkit.rst
===================================================================
--- trunk/blender_docs/manual/addons/3d_view/blenderkit.rst 2021-11-23 21:49:35 UTC (rev 8673)
+++ trunk/blender_docs/manual/addons/3d_view/blenderkit.rst 2021-11-23 21:51:53 UTC (rev 8674)
@@ -1,644 +0,0 @@
-
-**********
-BlenderKit
-**********
-
-`BlenderKit <https://www.blenderkit.com/>`__ is an online database of materials, brushes, and 3D models
-which you can search, download, upload and rate directly from the add-on.
-
-
-Activation
-==========
-
-- Open Blender and go to Preferences then the Add-ons tab.
-- Click 3D View then BlenderKit Asset Library to enable the script.
-
-
-Account and Login
------------------
-
-Click on the sign-up button to create a new account and activate it by pressing *Log in*
-directly in BlenderKit settings. It will direct you to log in through our website.
-
-
-Basic Usage
-===========
-
-#. Type a search term into the search field.
-
- .. figure:: /images/addons_3d-view_blenderkit_search-sidebar.jpg
- :width: 300px
-
-#. The result are shown in the Assetbar.
-
- .. figure:: /images/addons_3d-view_blenderkit_assetbar.jpg
- :width: 300px
-
-#. Drag-and-drop the material or model into your scene.
-
- .. figure:: /images/addons_3d-view_blenderkit_drag-drop.jpg
- :width: 300px
-
-
-Interface
-=========
-
-.. _bpy.ops.scene.blenderkit_download:
-.. _bpy.ops.view3d.blenderkit_asset_bar:
-
-Assetbar
---------
-
-.. reference::
-
- :Panel: :menuselection:`Assetbar`
-
-.. figure:: /images/addons_3d-view_blenderkit_assetbar.jpg
- :align: center
- :width: 600px
-
-The Assetbar shows search results and allows you to interact with them.
-It pops up when the search results are retrieved from the server.
-The Assetbar can be shown or hidden by clicking the toggle with the eye icon next to the search field.
-
-Actions that can be performed in the Assetbar:
-
-- Drag and dropping an object or material directly into the scene.
-- Click on an item to link/append it to the scene.
-- Open the context menu of an item for further interaction:
-
- Open Authors Website
- Opens the link that the author has specified in a web browser.
- Show Assets by Author
- Shows all assets uploaded by the author of the selected 3D model.
- Replace Active Models
- Replace all selected assets with the last selected asset (active).
- If you use this option from the context menu, the target asset is downloaded and replaces selected assets.
-
-- Use the :kbd:`Wheel` to scroll the results.
-- Click arrows on the side of the Assetbar for a jump to the next or previous page.
-
-
-BlenderKit Profile Panel
-------------------------
-
-.. reference::
-
- :Panel: :menuselection:`Sidebar --> BlenderKit --> BlenderKit Profile`
-
-.. figure:: /images/addons_3d-view_blenderkit_sidebar-search-bkprofile.jpg
- :align: right
- :width: 300px
-
-This panel shows your login information and information about your public and private remaining storage.
-
-See My Uploads
- Open the BlenderKit website and show a list of your assets.
-
-
-BlenderKit Login Panel
-----------------------
-
-.. reference::
-
- :Panel: :menuselection:`Sidebar --> BlenderKit --> BlenderKit Login`
-
-.. figure:: /images/addons_3d-view_blenderkit_sidebar-search-login.jpg
- :align: right
- :width: 300px
-
-.. _bpy.ops.wm.blenderkit_login:
-
-Log In
- Log in online on BlenderKit web page.
-
-.. _bpy.ops.wm.blenderkit_logout:
-
-Log Out
- Log out from BlenderKit.
-
-
-Find and Upload Assets Panel
-----------------------------
-
-.. reference::
-
- :Panel: :menuselection:`Sidebar --> BlenderKit --> Find and Upload`
-
-.. figure:: /images/addons_3d-view_blenderkit_search-sidebar.jpg
- :align: right
- :width: 300px
-
-The main panel enables you to Search or Upload all supported asset types.
-
-Search/Upload
- Switch the main panel between the Search and Upload tabs.
-
-
-Search and Download
--------------------
-
-.. reference::
-
- :Panel: :menuselection:`Sidebar --> BlenderKit --> Find and Upload --> Search`
-
-.. figure:: /images/addons_3d-view_blenderkit_sidebar-search-common.jpg
- :align: right
- :width: 300px
-
-Models/Materials/Brushes
- Switch between asset types available in BlenderKit.
-
-These controls are common for all asset types:
-
-.. _bpy.ops.view3d.blenderkit_search:
-
-Search
- Search assets by name.
-Show (eye icon) :kbd:`;`
- Show/hide the Assetbar viewport overlay.
-Style
- Search filter limiting the results (realistic, painted, polygonal, and other).
-
-
-Models Search Options
-^^^^^^^^^^^^^^^^^^^^^
-
-.. reference::
-
- :Panel: :menuselection:`Sidebar --> BlenderKit --> Find and Upload --> Search --> Models`
-
-.. _bpy.data.scenes.blenderkit_models.own_only:
-
-My Assets
- Search only for your 3D models.
-
-.. _bpy.data.scenes.blenderkit_models.free_only:
-
-Free Only
- Show only free models. This option is available only for models, since all Materials and all Brushes are free.
-
-Search Filters:
- .. _bpy.data.scenes.blenderkit_models.search_condition:
-
- Condition
- Condition of the object.
-
- New, Used, Old, Desolate
-
- .. _bpy.data.scenes.blenderkit_models.search_design_year:
-
- Designed In (min - max)
- When the object was approximately designed in terms of *year*.
- Can be used for parallel worlds or future :abbr:`sci-fi (Science Fiction)` dates
- (search for sci-fi assets by entering 2100 as minimum year).
-
- .. _bpy.data.scenes.blenderkit_models.search_polycount:
-
- Poly Count In (min - max)
- Use the poly count of 3D object for filtering.
-
- .. _bpy.data.scenes.blenderkit_models.search_texture_resolution:
-
- Texture Resolution (min - max)
- Limit search to the texture resolutions in a range.
-
- .. _bpy.data.scenes.blenderkit_models.search_file_size:
-
- File Size (min - max)
- Limit search file size. This uses the basic file size of the original file.
-
-
-Categories
-^^^^^^^^^^
-
-.. reference::
-
- :Panel: :menuselection:`Sidebar --> BlenderKit --> Find and Upload --> Search --> Models --> Categories`
-
-Category panel enables direct browsing of BlenderKit categories.
-
-.. _bpy.ops.view3d.blenderkit_set_category:
-
-Set Category ``>>``
- Visit subcategory.
-Return ``↲``
- Return to parent category.
-
-
-Import Method
-^^^^^^^^^^^^^
-
-.. reference::
-
- :Panel: :menuselection:`Sidebar --> BlenderKit --> Find and Upload --> Search --> Models --> Import settings`
-
-.. figure:: /images/addons_3d-view_blenderkit_sidebar-search-models-importsettings-only.jpg
- :align: right
- :width: 300px
-
-.. _bpy.data.scenes.blenderkit_models.link_method:
-
-Link
- Link 3D model into Blender scene. Linked models are saved in original files.
- To edit them, you need to open the model in the subdirectory of your project: -- assets/models.
- Linking helps to keep file size low.
-
-.. _bpy.data.scenes.blenderkit_models.append_method:
-
-Append
- Append 3D model into Blender scene. Appended objects are included and editable in your scene.
-
-.. _bpy.data.scenes.blenderkit_models.randomize_rotation:
-
-Randomize Rotation
- Randomize the rotation of the model around the Z axis during placement in the Blender scene.
-
-.. _bpy.data.scenes.blenderkit_models.perpendicular_snap:
-
-Perpendicular Snap
- Limit snapping if the angle is close to perpendicular angles to become exactly perpendicular.
- Useful for placing lamps on curved ceilings, or placing trees on slopes, or similar cases.
-
-.. _bpy.data.scenes.blenderkit_models.perpendicular_snap_treshold:
-
-Threshold
- Limit perpendicular snap.
-
-
-Materials Search Options
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-.. reference::
-
- :Panel: :menuselection:`Sidebar --> BlenderKit --> Find and Upload --> Search --> Materials`
-
-Search filters:
-
-.. _bpy.data.scenes.blenderkit_mat.search_procedural:
-
-Procedural/Texture Based/Both
- Limit search to only procedural or texture based materials.
-
-.. _bpy.data.scenes.blenderkit_mat.search_texture_resolution:
-
-Texture Resolution
- Limit search with resolution of the texture.
-
-.. _bpy.data.scenes.blenderkit_mat.search_file_size:
-
-File Size
- Limit search with file size.
-
-
-Categories
-^^^^^^^^^^
-
-.. reference::
-
- :Panel: :menuselection:`Sidebar --> BlenderKit --> Find and Upload --> Search --> Materials --> Categories`
-
-Same as the model search.
-
-Set Category ``>>``
- Visit subcategory.
-Return ``↲``
- Return to parent category.
-
-
-Import Settings
-^^^^^^^^^^^^^^^
-
-.. _bpy.data.scenes.blenderkit_mat.automap:
-
-Auto-Map
- Add cube mapping UV to the object after drag-and-drop.
- This allows most materials to be applied instantly to any mesh.
- BlenderKit generates a new UV map called 'automap' and doesn't replace your previous UV maps.
- It also resets the texture space of the target object to (1, 1, 1)
- which enables most procedural materials to have correct scaling.
-
-
-Upload
-------
-
-Models/Materials/Brushes
- Switch between asset types which are available to upload in BlenderKit.
-
-
-Common Options
-^^^^^^^^^^^^^^
-
-.. figure:: /images/addons_3d-view_blenderkit_sidebar-upload-model-public-design.jpg
- :align: right
- :width: 300px
-
-Hide Asset Preview
- Show/Hide asset preview, which shows how the asset will approximately look for people searching the database.
-
-.. _bpy.ops.wm.url_open:
-
-Read Upload Instructions
- Open the `Upload manual <https://www.blenderkit.com/docs/upload-tutorials/>`__ on the BlenderKit website.
- Read the manuals for `models <https://www.blenderkit.com/docs/upload/>`__,
- `materials <https://www.blenderkit.com/docs/uploading-material/>`__,
- and `brushes <https://www.blenderkit.com/docs/uploading-brush/>`__ on the website.
-
-Upload
- Upload or re-upload the 3D model.
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-docboard-svn
mailing list