[Bf-docboard-svn] bf-manual: [8773] branches/blender-3.0-release/blender_docs/manual: Geometry Nodes: Add note about other types of instancing

[Hans Goudey]

Revision: 8773
          https://developer.blender.org/rBM8773
Author:   HooglyBoogly
Date:     2021-12-06 17:03:55 +0100 (Mon, 06 Dec 2021)
Log Message:
-----------
Geometry Nodes: Add note about other types of instancing

Modified Paths:
--------------
    branches/blender-3.0-release/blender_docs/manual/modeling/geometry_nodes/instances.rst
    branches/blender-3.0-release/blender_docs/manual/scene_layout/object/properties/instancing/index.rst

Modified: branches/blender-3.0-release/blender_docs/manual/modeling/geometry_nodes/instances.rst
===================================================================
--- branches/blender-3.0-release/blender_docs/manual/modeling/geometry_nodes/instances.rst	2021-12-06 15:56:56 UTC (rev 8772)
+++ branches/blender-3.0-release/blender_docs/manual/modeling/geometry_nodes/instances.rst	2021-12-06 16:03:55 UTC (rev 8773)
@@ -24,6 +24,12 @@
 is the :doc:`/modeling/geometry_nodes/instances/instance_on_points`.
 
 
+.. warning::
+
+   Currently instancing from geometry nodes cannot be mixed with instancing from the
+   :doc:`/scene_layout/object/properties/instancing/index` panel in the property editor.
+
+
 .. _geometry-nodes_nested-instancing:
 
 Nested Instancing

Modified: branches/blender-3.0-release/blender_docs/manual/scene_layout/object/properties/instancing/index.rst
===================================================================
--- branches/blender-3.0-release/blender_docs/manual/scene_layout/object/properties/instancing/index.rst	2021-12-06 15:56:56 UTC (rev 8772)
+++ branches/blender-3.0-release/blender_docs/manual/scene_layout/object/properties/instancing/index.rst	2021-12-06 16:03:55 UTC (rev 8773)
@@ -3,14 +3,10 @@
   Instancing
 ##############
 
-There are currently three ways in Blender to procedurally instantiate (or duplicate)
-objects directly from other objects.
-These options are located in the :menuselection:`Properties --> Object Properties --> Instancing` panel.
-
 .. note::
 
-   There are other ways to indirectly instantiate objects,
-   e.g. from a :doc:`particle system </physics/particles/emitter/render>`...
+   Geometry nodes provides a more flexible way to instance objects, with the
+   :doc:`/modeling/geometry_nodes/instances/instance_on_points`.
 
 Vertices
    This creates an instance of all children of this object on each vertex