diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/doxygen/doxygen.source.h | 4 | ||||
-rw-r--r-- | doc/python_api/examples/bpy.types.ManipulatorGroup.py | 29 | ||||
-rw-r--r-- | doc/python_api/examples/gpu.offscreen.1.py | 2 | ||||
-rw-r--r-- | doc/python_api/sphinx_doc_gen.py | 6 |
4 files changed, 41 insertions, 0 deletions
diff --git a/doc/doxygen/doxygen.source.h b/doc/doxygen/doxygen.source.h index 3ef20466664..6f12991fb44 100644 --- a/doc/doxygen/doxygen.source.h +++ b/doc/doxygen/doxygen.source.h @@ -223,6 +223,10 @@ * \ingroup editors */ +/** \defgroup edscene scene + * \ingroup editors + */ + /** \defgroup edsculpt sculpt and paint * \ingroup editors */ diff --git a/doc/python_api/examples/bpy.types.ManipulatorGroup.py b/doc/python_api/examples/bpy.types.ManipulatorGroup.py new file mode 100644 index 00000000000..fa431bc5a88 --- /dev/null +++ b/doc/python_api/examples/bpy.types.ManipulatorGroup.py @@ -0,0 +1,29 @@ +""" +Manipulator Overview +-------------------- + +Manipulators are created using two classes. + +- :class:`bpy.types.ManipulatorGroup` - stores a list of manipulators. + + The manipulator group is associated with a space and region type. +- :class:`bpy.types.Manipulator` - a single item which can be used. + + Each manipulator group has a collection of manipulators which it manages. + +The following example shows a manipulator group with a single, +manipulator used to control a lamp objects energy. + +.. literalinclude:: __/__/__/release/scripts/templates_py/manipulator_simple.py + + +It's also possible to use a manipulator to run an operator. + +.. literalinclude:: __/__/__/release/scripts/templates_py/manipulator_operator_target.py + +This more comprehensive example shows how an operator can create a temporary manipulator group to adjust its settings. + +.. literalinclude:: __/__/__/release/scripts/templates_py/manipulator_operator.py + +""" + diff --git a/doc/python_api/examples/gpu.offscreen.1.py b/doc/python_api/examples/gpu.offscreen.1.py index 75ddf804e70..ff1a7ad7cce 100644 --- a/doc/python_api/examples/gpu.offscreen.1.py +++ b/doc/python_api/examples/gpu.offscreen.1.py @@ -52,6 +52,7 @@ class OffScreenDraw(bpy.types.Operator): @staticmethod def _update_offscreen(context, offscreen): scene = context.scene + render_layer = context.render_layer render = scene.render camera = scene.camera @@ -65,6 +66,7 @@ class OffScreenDraw(bpy.types.Operator): offscreen.draw_view3d( scene, + render_layer, context.space_data, context.region, projection_matrix, diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py index 08c3e729ed9..75064f2c5ef 100644 --- a/doc/python_api/sphinx_doc_gen.py +++ b/doc/python_api/sphinx_doc_gen.py @@ -332,6 +332,9 @@ except ImportError: # to avoid having to match Blender's source tree. EXTRA_SOURCE_FILES = ( "../../../release/scripts/templates_py/bmesh_simple.py", + "../../../release/scripts/templates_py/manipulator_operator.py", + "../../../release/scripts/templates_py/manipulator_operator_target.py", + "../../../release/scripts/templates_py/manipulator_simple.py", "../../../release/scripts/templates_py/operator_simple.py", "../../../release/scripts/templates_py/ui_panel_simple.py", "../../../release/scripts/templates_py/ui_previews_custom_icon.py", @@ -1024,6 +1027,7 @@ context_type_map = { "brush": ("Brush", False), "camera": ("Camera", False), "cloth": ("ClothModifier", False), + "collection": ("LayerCollection", False), "collision": ("CollisionModifier", False), "curve": ("Curve", False), "dynamic_paint": ("DynamicPaintModifier", False), @@ -1044,6 +1048,7 @@ context_type_map = { "image_paint_object": ("Object", False), "lamp": ("Lamp", False), "lattice": ("Lattice", False), + "lightprobe": ("LightProbe", False), "line_style": ("FreestyleLineStyle", False), "material": ("Material", False), "material_slot": ("MaterialSlot", False), @@ -1055,6 +1060,7 @@ context_type_map = { "particle_system": ("ParticleSystem", False), "particle_system_editable": ("ParticleSystem", False), "pose_bone": ("PoseBone", False), + "render_layer": ("SceneLayer", False), "scene": ("Scene", False), "sculpt_object": ("Object", False), "selectable_bases": ("ObjectBase", True), |