BPython:

- Fixed uninitialized NMFace.mode var in NMesh.c
- Incref'ed a couple Py_None's in Object.c
- Minor update in the docs, changed required version to 2.30

4 files changed, 11 insertions, 7 deletions

diff --git a/source/blender/python/api2_2x/NMesh.c b/source/blender/python/api2_2x/NMesh.c
index 115cefe114a..28f89712fb0 100644
--- a/source/blender/python/api2_2x/NMesh.c
+++ b/source/blender/python/api2_2x/NMesh.c
@@ -1279,6 +1279,8 @@ static BPy_NMFace *nmface_from_data(BPy_NMesh *mesh, int vidxs[4],
 		col = (MCol *) (tface->col);	/* XXX weird, tface->col is uint[4] */
 	}
 	else {
+		newf->mode = TF_DYNAMIC; /* just to initialize it to something meaninful,*/
+		/* since without tfaces there are no tface->mode's, obviously. */
 		newf->image = NULL;
 		newf->uv = PyList_New(0); 
 	} 
diff --git a/source/blender/python/api2_2x/Object.c b/source/blender/python/api2_2x/Object.c
index 1bdb234cf51..b3ea03e0fc1 100644
--- a/source/blender/python/api2_2x/Object.c
+++ b/source/blender/python/api2_2x/Object.c
@@ -990,7 +990,7 @@ static PyObject *Object_link (BPy_Object *self, PyObject *args)
 				"old object reference count below 0"));
 		}
 	}
-	return (Py_None);
+	return EXPP_incr_ret (Py_None);
 }
 
 static PyObject *Object_makeParent (BPy_Object *self, PyObject *args)
@@ -1059,7 +1059,7 @@ static PyObject *Object_makeParent (BPy_Object *self, PyObject *args)
 		/* We don't need the child object anymore. */
 		Py_DECREF ((PyObject *) child);
 	}
-	return (Py_None);
+	return EXPP_incr_ret (Py_None);
 }
 
 static PyObject *Object_materialUsage (BPy_Object *self, PyObject *args)
@@ -1256,7 +1256,7 @@ static PyObject *Object_setMaterials (BPy_Object *self, PyObject *args)
 				break;
 		}
 	}
-	return (Py_None);
+	return EXPP_incr_ret (Py_None);
 }
 
 static PyObject *Object_setName (BPy_Object *self, PyObject *args)
diff --git a/source/blender/python/api2_2x/doc/Blender.py b/source/blender/python/api2_2x/doc/Blender.py
index 61d4af35e2a..a5698123920 100644
--- a/source/blender/python/api2_2x/doc/Blender.py
+++ b/source/blender/python/api2_2x/doc/Blender.py
@@ -4,7 +4,7 @@
 # Doc system used: epydoc - http://epydoc.sf.net
 # command line:
 
-# epydoc -o BPY_API_228 --url "http://www.blender.org" -t Blender.py \
+# epydoc -o BPY_API_230 --url "http://www.blender.org" -t Blender.py \
 # -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 \
@@ -52,8 +52,8 @@ The Blender Python API Reference
  open-source language.
 
 @author: The Blender Python Team
-@requires: Blender 2.28 (already updated for 2.28a) or newer.
-@version: 0.1
+@requires: Blender 2.30 or newer.
+@version: 0.2
 @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/NMesh.py b/source/blender/python/api2_2x/doc/NMesh.py
index af70de42ea6..533cf80195e 100644
--- a/source/blender/python/api2_2x/doc/NMesh.py
+++ b/source/blender/python/api2_2x/doc/NMesh.py
@@ -42,7 +42,9 @@ Example::
     - SELECT - selected.
     - HIDE - hidden.
     - ACTIVE - the active face.
-@var FaceModes: The available face modes.
+@var FaceModes: The available face modes. Note: these are only meaninful if
+  nmesh.hasFaceUV() returns true, since in Blender this info is stored at the
+  TexFace (TexFace button in Edit Mesh buttons) structure.
     - ALL - set all modes at once.
     - BILLBOARD - always orient after camera.
     - HALO - halo face, always point to camera.