diff --git a/source/blender/python/api2_2x/Types.c b/source/blender/python/api2_2x/Types.c index 5dbdc8efcfb611b0152498bad6a16482f12518d3..dbda9e936e2aca45c9b6f47d3159be5f5a18aa13 100644 --- a/source/blender/python/api2_2x/Types.c +++ b/source/blender/python/api2_2x/Types.c @@ -53,7 +53,8 @@ PyObject *Types_Init (void) /* Another one that needs to be here: */ Text_Type.ob_type = &PyType_Type; - Texture_Type.ob_type = &PyType_Type; + Texture_Type.ob_type = &PyType_Type; + MTex_Type.ob_type = &PyType_Type; submodule = Py_InitModule3 ("Blender.Types", Null_methods, M_Types_doc); @@ -89,6 +90,9 @@ PyObject *Types_Init (void) PyDict_SetItemString(dict, "LatticeType", (PyObject *)&Lattice_Type); + PyDict_SetItemString(dict, "TextureType", (PyObject *)&Texture_Type); + PyDict_SetItemString(dict, "MTexType", (PyObject *)&MTex_Type); + /* External helper Types available to the main ones above */ PyDict_SetItemString(dict, "vectorType", (PyObject *)&vector_Type); diff --git a/source/blender/python/api2_2x/Types.h b/source/blender/python/api2_2x/Types.h index 65923ccfd1a5244c8ba0f0ad91e330628560e83d..838b45c9d7939382cbd5e4ee0fb1937acf753a90 100644 --- a/source/blender/python/api2_2x/Types.h +++ b/source/blender/python/api2_2x/Types.h @@ -36,7 +36,7 @@ extern PyTypeObject Button_Type, Material_Type; -extern PyTypeObject Texture_Type; +extern PyTypeObject Texture_Type, MTex_Type; extern PyTypeObject Object_Type; extern PyTypeObject Scene_Type; diff --git a/source/blender/python/api2_2x/doc/Blender.py b/source/blender/python/api2_2x/doc/Blender.py index 035d1719dcf9b918393ef20e2d592db96cebcd5b..c72c9eb0331585a9aeec779109478815d6fd61ec 100644 --- a/source/blender/python/api2_2x/doc/Blender.py +++ b/source/blender/python/api2_2x/doc/Blender.py @@ -8,7 +8,7 @@ # -n "Blender" --no-private --no-frames Blender.py \ # Types.py Scene.py Object.py NMesh.py Material.py Camera.py Lamp.py \ # Armature.py Metaball.py Effect.py Curve.py Ipo.py World.py BGL.py Window.py \ -# Draw.py Image.py Text.py +# Draw.py Image.py Text.py Lattice.py Texture.py """ The main Blender module. @@ -19,25 +19,26 @@ The Blender Python API Reference Submodules: ----------- - - L{Types} - - L{Scene} - - L{Object} - - L{NMesh} - - L{Material} - - L{Texture} - L{Armature} + - L{BGL} - L{Camera} - - L{Lamp} - - L{World} - - L{Metaball} - - L{Effect} - L{Curve} - - L{Ipo} - - L{BGL} - L{Draw} - - L{Window} + - L{Effect} - L{Image} + - L{Ipo} + - L{Lamp} + - L{Lattice} + - L{Material} + - L{Metaball} + - L{NMesh} + - L{Object} + - L{Scene} - L{Text} + - L{Texture} + - L{Types} + - L{Window} + - L{World} Introduction: ------------- @@ -53,8 +54,8 @@ The Blender Python API Reference open-source language. @author: The Blender Python Team -@requires: Blender 2.30 or newer. -@version: 0.2 +@requires: Blender 2.31 or newer. +@version: 0.3 @see: U{www.blender.org<http://www.blender.org>} @see: U{projects.blender.org<http://projects.blender.org>} @see: U{www.python.org<http://www.python.org>} diff --git a/source/blender/python/api2_2x/doc/Types.py b/source/blender/python/api2_2x/doc/Types.py index 49c87cde4c3164ec0781d4cefaf1940b6d344ccf..c8a2ebb87c0d147689b9042336d10ca50902ac98 100644 --- a/source/blender/python/api2_2x/doc/Types.py +++ b/source/blender/python/api2_2x/doc/Types.py @@ -49,4 +49,6 @@ objects. @var bufferType: Blender buffer. A contiguous piece of storage, used in BGL. @var constantType: Blender constant. A constant dictionary. @var rgbTupleType: Blender rgbTuple. A (red, green, blue) triplet. +@var TextureType: Blender Texture. +@var MTexType: Blender MTex -- it links materials to a texture. """