more housekeeping. move static declarations and definititions out of .h files.

tidy up initializers and  c++ style comments.

1 files changed, 620 insertions, 429 deletions

diff --git a/source/blender/python/api2_2x/Camera.c b/source/blender/python/api2_2x/Camera.c
index 53a672cecce..04d96ed5fbd 100644
--- a/source/blender/python/api2_2x/Camera.c
+++ b/source/blender/python/api2_2x/Camera.c
@@ -35,185 +35,327 @@
 #include <BKE_library.h>
 #include <BLI_blenlib.h>
 
+#include <Python.h>
+#include <DNA_camera_types.h>
+#include "constant.h"
+#include "gen_utils.h"
+#include "modules.h"
+
 #include "Camera.h"
 
+
 /*****************************************************************************/
-/* Python Camera_Type structure definition:																	 */
+/* Python API function prototypes for the Camera module.                     */
 /*****************************************************************************/
-PyTypeObject Camera_Type =
-{
-	PyObject_HEAD_INIT(NULL)
-	0,														 /* ob_size */
-	"Blender Camera",							 /* tp_name */
-	sizeof (BPy_Camera),					 /* tp_basicsize */
-	0,														 /* tp_itemsize */
-	/* methods */
-	(destructor)Camera_dealloc,		 /* tp_dealloc */
-	0,														 /* tp_print */
-	(getattrfunc)Camera_getAttr,	 /* tp_getattr */
-	(setattrfunc)Camera_setAttr,	 /* tp_setattr */
-	(cmpfunc)Camera_compare,			 /* tp_compare */
-	(reprfunc)Camera_repr,				 /* tp_repr */
-	0,														 /* tp_as_number */
-	0,														 /* tp_as_sequence */
-	0,														 /* tp_as_mapping */
-	0,														 /* tp_as_hash */
-	0,0,0,0,0,0,
-	0,														 /* tp_doc */ 
-	0,0,0,0,0,0,
-	BPy_Camera_methods,						 /* tp_methods */
-	0,														 /* tp_members */
+static PyObject *M_Camera_New (PyObject * self, PyObject * args,
+			       PyObject * keywords);
+static PyObject *M_Camera_Get (PyObject * self, PyObject * args);
+
+/*****************************************************************************/
+/* The following string definitions are used for documentation strings.      */
+/* In Python these will be written to the console when doing a               */
+/* Blender.Camera.__doc__                                                    */
+/*****************************************************************************/
+static char M_Camera_doc[] = "The Blender Camera module\n\
+\n\
+This module provides access to **Camera Data** objects in Blender\n\
+\n\
+Example::\n\
+\n\
+  from Blender import Camera, Object, Scene\n\
+  c = Camera.New('ortho')      # create new ortho camera data\n\
+  c.lens = 35.0                # set lens value\n\
+  cur = Scene.getCurrent()     # get current Scene\n\
+  ob = Object.New('Camera')    # make camera object\n\
+  ob.link(c)                   # link camera data with this object\n\
+  cur.link(ob)                 # link object into scene\n\
+  cur.setCurrentCamera(ob)     # make this camera the active";
+
+static char M_Camera_New_doc[] =
+  "Camera.New (type = 'persp', name = 'CamData'):\n\
+        Return a new Camera Data object with the given type and name.";
+
+static char M_Camera_Get_doc[] = "Camera.Get (name = None):\n\
+        Return the camera data with the given 'name', None if not found, or\n\
+        Return a list with all Camera Data objects in the current scene,\n\
+        if no argument was given.";
+
+/*****************************************************************************/
+/* Python method structure definition for Blender.Camera module:             */
+/*****************************************************************************/
+struct PyMethodDef M_Camera_methods[] = {
+  {"New", (PyCFunction) M_Camera_New, METH_VARARGS | METH_KEYWORDS,
+   M_Camera_New_doc},
+  {"Get", M_Camera_Get, METH_VARARGS, M_Camera_Get_doc},
+  {"get", M_Camera_Get, METH_VARARGS, M_Camera_Get_doc},
+  {NULL, NULL, 0, NULL}
 };
 
-static PyObject *M_Camera_New(PyObject *self, PyObject *args, PyObject *kwords)
-{
-	char				*type_str = "persp"; /* "persp" is type 0, "ortho" is type 1 */
-	char				*name_str = "CamData";
-	static char *kwlist[] = {"type_str", "name_str", NULL};
-	PyObject		*pycam; /* for Camera Data object wrapper in Python */
-	Camera			*blcam; /* for actual Camera Data we create in Blender */
-	char				buf[21];
-
-	/* Parse the arguments passed in by the Python interpreter */
-	if (!PyArg_ParseTupleAndKeywords(args, kwords, "|ss", kwlist,
-																	 &type_str, &name_str))
-	/* We expected string(s) (or nothing) as argument, but we didn't get that. */
-		return EXPP_ReturnPyObjError (PyExc_AttributeError,
-						"expected zero, one or two strings as arguments");
-
-	blcam = add_camera(); /* first create the Camera Data in Blender */
-
-	if (blcam) /* now create the wrapper obj in Python */
-		pycam = Camera_CreatePyObject (blcam);
-	else
-		return EXPP_ReturnPyObjError (PyExc_RuntimeError,
-														"couldn't create Camera Data in Blender");
-
-	/* let's return user count to zero, because ... */
-	blcam->id.us = 0; /* ... add_camera() incref'ed it */
-	/* XXX XXX Do this in other modules, too */
-
-	if (pycam == NULL)
-		return EXPP_ReturnPyObjError (PyExc_MemoryError,
-														"couldn't create Camera PyObject");
-
-	if (strcmp (type_str, "persp") == 0) /* default, no need to set, so */
-		/*blcam->type = (short)EXPP_CAM_TYPE_PERSP*/; /* we comment this line */
-	else if (strcmp (type_str, "ortho") == 0)
-		blcam->type = (short)EXPP_CAM_TYPE_ORTHO;
-	else
-		return EXPP_ReturnPyObjError (PyExc_AttributeError,
-						"unknown camera type");
-
-	if (strcmp (name_str, "CamData") == 0)
-		return pycam;
-	else { /* user gave us a name for the camera, use it */
-		PyOS_snprintf (buf, sizeof(buf), "%s", name_str);
-		rename_id (&blcam->id, buf); /* proper way in Blender */
-	}
+/*****************************************************************************/
+/* Python BPy_Camera methods declarations:                                   */
+/*****************************************************************************/
+static PyObject *Camera_getIpo (BPy_Camera * self);
+static PyObject *Camera_getName (BPy_Camera * self);
+static PyObject *Camera_getType (BPy_Camera * self);
+static PyObject *Camera_getMode (BPy_Camera * self);
+static PyObject *Camera_getLens (BPy_Camera * self);
+static PyObject *Camera_getClipStart (BPy_Camera * self);
+static PyObject *Camera_getClipEnd (BPy_Camera * self);
+static PyObject *Camera_getDrawSize (BPy_Camera * self);
+static PyObject *Camera_setIpo (BPy_Camera * self, PyObject * args);
+static PyObject *Camera_clearIpo (BPy_Camera * self);
+static PyObject *Camera_setName (BPy_Camera * self, PyObject * args);
+static PyObject *Camera_setType (BPy_Camera * self, PyObject * args);
+static PyObject *Camera_setIntType (BPy_Camera * self, PyObject * args);
+static PyObject *Camera_setMode (BPy_Camera * self, PyObject * args);
+static PyObject *Camera_setIntMode (BPy_Camera * self, PyObject * args);
+static PyObject *Camera_setLens (BPy_Camera * self, PyObject * args);
+static PyObject *Camera_setClipStart (BPy_Camera * self, PyObject * args);
+static PyObject *Camera_setClipEnd (BPy_Camera * self, PyObject * args);
+static PyObject *Camera_setDrawSize (BPy_Camera * self, PyObject * args);
 
-	return pycam;
+/*****************************************************************************/
+/* Python BPy_Camera methods table:                                          */
+/*****************************************************************************/
+static PyMethodDef BPy_Camera_methods[] = {
+  /* name, method, flags, doc */
+  {"getIpo", (PyCFunction) Camera_getIpo, METH_NOARGS,
+   "() - Return Camera Data Ipo"},
+  {"getName", (PyCFunction) Camera_getName, METH_NOARGS,
+   "() - Return Camera Data name"},
+  {"getType", (PyCFunction) Camera_getType, METH_NOARGS,
+   "() - Return Camera type - 'persp':0, 'ortho':1"},
+  {"getMode", (PyCFunction) Camera_getMode, METH_NOARGS,
+   "() - Return Camera mode flags (or'ed value) -\n"
+   "     'showLimits':1, 'showMist':2"},
+  {"getLens", (PyCFunction) Camera_getLens, METH_NOARGS,
+   "() - Return Camera lens value"},
+  {"getClipStart", (PyCFunction) Camera_getClipStart, METH_NOARGS,
+   "() - Return Camera clip start value"},
+  {"getClipEnd", (PyCFunction) Camera_getClipEnd, METH_NOARGS,
+   "() - Return Camera clip end value"},
+  {"getDrawSize", (PyCFunction) Camera_getDrawSize, METH_NOARGS,
+   "() - Return Camera draw size value"},
+  {"setIpo", (PyCFunction) Camera_setIpo, METH_VARARGS,
+   "(Blender Ipo) - Set Camera Ipo"},
+  {"clearIpo", (PyCFunction) Camera_clearIpo, METH_NOARGS,
+   "() - Unlink Ipo from this Camera."},
+  {"setName", (PyCFunction) Camera_setName, METH_VARARGS,
+   "(s) - Set Camera Data name"},
+  {"setType", (PyCFunction) Camera_setType, METH_VARARGS,
+   "(s) - Set Camera type, which can be 'persp' or 'ortho'"},
+  {"setMode", (PyCFunction) Camera_setMode, METH_VARARGS,
+   "(<s<,s>>) - Set Camera mode flag(s): 'showLimits' and 'showMist'"},
+  {"setLens", (PyCFunction) Camera_setLens, METH_VARARGS,
+   "(f) - Set Camera lens value"},
+  {"setClipStart", (PyCFunction) Camera_setClipStart, METH_VARARGS,
+   "(f) - Set Camera clip start value"},
+  {"setClipEnd", (PyCFunction) Camera_setClipEnd, METH_VARARGS,
+   "(f) - Set Camera clip end value"},
+  {"setDrawSize", (PyCFunction) Camera_setDrawSize, METH_VARARGS,
+   "(f) - Set Camera draw size value"},
+  {NULL, NULL, 0, NULL}
+};
+
+/*****************************************************************************/
+/* Python Camera_Type callback function prototypes:                          */
+/*****************************************************************************/
+static void Camera_dealloc (BPy_Camera * self);
+static int Camera_setAttr (BPy_Camera * self, char *name, PyObject * v);
+static int Camera_compare (BPy_Camera * a, BPy_Camera * b);
+static PyObject *Camera_getAttr (BPy_Camera * self, char *name);
+static PyObject *Camera_repr (BPy_Camera * self);
+
+
+/*****************************************************************************/
+/* Python Camera_Type structure definition:																	 */
+/*****************************************************************************/
+PyTypeObject Camera_Type = {
+  PyObject_HEAD_INIT (NULL) 0,	/* ob_size */
+  "Blender Camera",		/* tp_name */
+  sizeof (BPy_Camera),		/* tp_basicsize */
+  0,				/* tp_itemsize */
+  /* methods */
+  (destructor) Camera_dealloc,	/* tp_dealloc */
+  0,				/* tp_print */
+  (getattrfunc) Camera_getAttr,	/* tp_getattr */
+  (setattrfunc) Camera_setAttr,	/* tp_setattr */
+  (cmpfunc) Camera_compare,	/* tp_compare */
+  (reprfunc) Camera_repr,	/* tp_repr */
+  0,				/* tp_as_number */
+  0,				/* tp_as_sequence */
+  0,				/* tp_as_mapping */
+  0,				/* tp_as_hash */
+  0, 0, 0, 0, 0, 0,
+  0,				/* tp_doc */
+  0, 0, 0, 0, 0, 0,
+  BPy_Camera_methods,		/* tp_methods */
+  0,				/* tp_members */
+};
+
+static PyObject *
+M_Camera_New (PyObject * self, PyObject * args, PyObject * kwords)
+{
+  char *type_str = "persp";	/* "persp" is type 0, "ortho" is type 1 */
+  char *name_str = "CamData";
+  static char *kwlist[] = { "type_str", "name_str", NULL };
+  PyObject *pycam;		/* for Camera Data object wrapper in Python */
+  Camera *blcam;		/* for actual Camera Data we create in Blender */
+  char buf[21];
+
+  /* Parse the arguments passed in by the Python interpreter */
+  if (!PyArg_ParseTupleAndKeywords (args, kwords, "|ss", kwlist,
+				    &type_str, &name_str))
+    /* We expected string(s) (or nothing) as argument, but we didn't get that. */
+    return EXPP_ReturnPyObjError (PyExc_AttributeError,
+				  "expected zero, one or two strings as arguments");
+
+  blcam = add_camera ();	/* first create the Camera Data in Blender */
+
+  if (blcam)			/* now create the wrapper obj in Python */
+    pycam = Camera_CreatePyObject (blcam);
+  else
+    return EXPP_ReturnPyObjError (PyExc_RuntimeError,
+				  "couldn't create Camera Data in Blender");
+
+  /* let's return user count to zero, because ... */
+  blcam->id.us = 0;		/* ... add_camera() incref'ed it */
+  /* XXX XXX Do this in other modules, too */
+
+  if (pycam == NULL)
+    return EXPP_ReturnPyObjError (PyExc_MemoryError,
+				  "couldn't create Camera PyObject");
+
+  if (strcmp (type_str, "persp") == 0)	/* default, no need to set, so */
+    /*blcam->type = (short)EXPP_CAM_TYPE_PERSP */ ;
+  /* we comment this line */
+  else if (strcmp (type_str, "ortho") == 0)
+    blcam->type = (short) EXPP_CAM_TYPE_ORTHO;
+  else
+    return EXPP_ReturnPyObjError (PyExc_AttributeError,
+				  "unknown camera type");
+
+  if (strcmp (name_str, "CamData") == 0)
+    return pycam;
+  else
+    {				/* user gave us a name for the camera, use it */
+      PyOS_snprintf (buf, sizeof (buf), "%s", name_str);
+      rename_id (&blcam->id, buf);	/* proper way in Blender */
+    }
+
+  return pycam;
 }
 
-static PyObject *M_Camera_Get(PyObject *self, PyObject *args)
+static PyObject *
+M_Camera_Get (PyObject * self, PyObject * args)
 {
-	char	 *name = NULL;
-	Camera *cam_iter;
-
-	if (!PyArg_ParseTuple(args, "|s", &name))
-		return EXPP_ReturnPyObjError (PyExc_TypeError,
-						"expected string argument (or nothing)");
+  char *name = NULL;
+  Camera *cam_iter;
 
-	cam_iter = G.main->camera.first;
+  if (!PyArg_ParseTuple (args, "|s", &name))
+    return EXPP_ReturnPyObjError (PyExc_TypeError,
+				  "expected string argument (or nothing)");
 
-	if (name) { /* (name) - Search camera by name */
+  cam_iter = G.main->camera.first;
 
-		PyObject *wanted_cam = NULL;
+  if (name)
+    {				/* (name) - Search camera by name */
 
-		while (cam_iter && !wanted_cam) {
+      PyObject *wanted_cam = NULL;
 
-			if (strcmp (name, cam_iter->id.name+2) == 0) {
-				wanted_cam = Camera_CreatePyObject (cam_iter);
-				break;
-			}
+      while (cam_iter && !wanted_cam)
+	{
 
-			cam_iter = cam_iter->id.next;
-		}
+	  if (strcmp (name, cam_iter->id.name + 2) == 0)
+	    {
+	      wanted_cam = Camera_CreatePyObject (cam_iter);
+	      break;
+	    }
 
-		if (!wanted_cam) { /* Requested camera doesn't exist */
-			char error_msg[64];
-			PyOS_snprintf(error_msg, sizeof(error_msg),
-											"Camera \"%s\" not found", name);
-			return EXPP_ReturnPyObjError (PyExc_NameError, error_msg);
-		}
+	  cam_iter = cam_iter->id.next;
+	}
 
-		return wanted_cam;
+      if (!wanted_cam)
+	{			/* Requested camera doesn't exist */
+	  char error_msg[64];
+	  PyOS_snprintf (error_msg, sizeof (error_msg),
+			 "Camera \"%s\" not found", name);
+	  return EXPP_ReturnPyObjError (PyExc_NameError, error_msg);
 	}
 
-	else { /* () - return a list of wrappers for all cameras in the scene */
-		int index = 0;
-		PyObject *cam_pylist, *pyobj;
+      return wanted_cam;
+    }
 
-		cam_pylist = PyList_New (BLI_countlist (&(G.main->camera)));
+  else
+    {				/* () - return a list of wrappers for all cameras in the scene */
+      int index = 0;
+      PyObject *cam_pylist, *pyobj;
 
-		if (!cam_pylist)
-			return PythonReturnErrorObject (PyExc_MemoryError,
-							"couldn't create PyList");
+      cam_pylist = PyList_New (BLI_countlist (&(G.main->camera)));
 
-		while (cam_iter) {
-			pyobj = Camera_CreatePyObject (cam_iter);
+      if (!cam_pylist)
+	return PythonReturnErrorObject (PyExc_MemoryError,
+					"couldn't create PyList");
 
-			if (!pyobj)
-				return PythonReturnErrorObject (PyExc_MemoryError,
-									"couldn't create Camera PyObject");
+      while (cam_iter)
+	{
+	  pyobj = Camera_CreatePyObject (cam_iter);
 
-			PyList_SET_ITEM (cam_pylist, index, pyobj);
+	  if (!pyobj)
+	    return PythonReturnErrorObject (PyExc_MemoryError,
+					    "couldn't create Camera PyObject");
 
-			cam_iter = cam_iter->id.next;
-			index++;
-		}
+	  PyList_SET_ITEM (cam_pylist, index, pyobj);
 
-		return cam_pylist;
+	  cam_iter = cam_iter->id.next;
+	  index++;
 	}
+
+      return cam_pylist;
+    }
 }
 
-PyObject *Camera_Init (void)
+PyObject *
+Camera_Init (void)
 {
-	PyObject	*submodule;
+  PyObject *submodule;
 
-	Camera_Type.ob_type = &PyType_Type;
+  Camera_Type.ob_type = &PyType_Type;
 
-	submodule = Py_InitModule3("Blender.Camera",
-									M_Camera_methods, M_Camera_doc);
+  submodule = Py_InitModule3 ("Blender.Camera",
+			      M_Camera_methods, M_Camera_doc);
 
-	return submodule;
+  return submodule;
 }
 
 /* Three Python Camera_Type helper functions needed by the Object module: */
 
-PyObject *Camera_CreatePyObject (Camera *cam)
+PyObject *
+Camera_CreatePyObject (Camera * cam)
 {
-	BPy_Camera *pycam;
+  BPy_Camera *pycam;
 
-	pycam = (BPy_Camera *)PyObject_NEW (BPy_Camera, &Camera_Type);
+  pycam = (BPy_Camera *) PyObject_NEW (BPy_Camera, &Camera_Type);
 
-	if (!pycam)
-		return EXPP_ReturnPyObjError (PyExc_MemoryError,
-						"couldn't create BPy_Camera PyObject");
+  if (!pycam)
+    return EXPP_ReturnPyObjError (PyExc_MemoryError,
+				  "couldn't create BPy_Camera PyObject");
 
-	pycam->camera = cam;
+  pycam->camera = cam;
 
-	return (PyObject *)pycam;
+  return (PyObject *) pycam;
 }
 
-int Camera_CheckPyObject (PyObject *pyobj)
+int
+Camera_CheckPyObject (PyObject * pyobj)
 {
-	return (pyobj->ob_type == &Camera_Type);
+  return (pyobj->ob_type == &Camera_Type);
 }
 
-Camera *Camera_FromPyObject (PyObject *pyobj)
+Camera *
+Camera_FromPyObject (PyObject * pyobj)
 {
-	return ((BPy_Camera *)pyobj)->camera;
+  return ((BPy_Camera *) pyobj)->camera;
 }
 
 /*****************************************************************************/
@@ -224,38 +366,41 @@ Camera *Camera_FromPyObject (PyObject *pyobj)
 /*							The function will return NULL when no object with the given  */
 /*							name is found.																							 */
 /*****************************************************************************/
-Camera * GetCameraByName (char * name)
+Camera *
+GetCameraByName (char *name)
 {
-	Camera	* cam_iter;
+  Camera *cam_iter;
 
-	cam_iter = G.main->camera.first;
-	while (cam_iter)
+  cam_iter = G.main->camera.first;
+  while (cam_iter)
+    {
+      if (StringEqual (name, GetIdName (&(cam_iter->id))))
 	{
-		if (StringEqual (name, GetIdName (&(cam_iter->id))))
-		{
-			return (cam_iter);
-		}
-		cam_iter = cam_iter->id.next;
+	  return (cam_iter);
 	}
+      cam_iter = cam_iter->id.next;
+    }
 
-	/* There is no camera with the given name */
-	return (NULL);
+  /* There is no camera with the given name */
+  return (NULL);
 }
 
 /*****************************************************************************/
 /* Python BPy_Camera methods:																								 */
 /*****************************************************************************/
 
-static PyObject *Camera_getIpo(BPy_Camera *self)
+static PyObject *
+Camera_getIpo (BPy_Camera * self)
 {
-	struct Ipo *ipo = self->camera->ipo;
+  struct Ipo *ipo = self->camera->ipo;
 
-	if (!ipo) {
-		Py_INCREF (Py_None);
-		return Py_None;
-	}
+  if (!ipo)
+    {
+      Py_INCREF (Py_None);
+      return Py_None;
+    }
 
-	return Ipo_CreatePyObject (ipo);
+  return Ipo_CreatePyObject (ipo);
 }
 
 
@@ -263,163 +408,187 @@ static PyObject *Camera_getIpo(BPy_Camera *self)
 
 
 
-static PyObject *Camera_getName(BPy_Camera *self)
+static PyObject *
+Camera_getName (BPy_Camera * self)
 {
 
-	PyObject *attr = PyString_FromString(self->camera->id.name+2);
+  PyObject *attr = PyString_FromString (self->camera->id.name + 2);
 
-	if (attr) return attr;
+  if (attr)
+    return attr;
 
-	return EXPP_ReturnPyObjError (PyExc_RuntimeError,
-																	 "couldn't get Camera.name attribute");
+  return EXPP_ReturnPyObjError (PyExc_RuntimeError,
+				"couldn't get Camera.name attribute");
 }
 
-static PyObject *Camera_getType(BPy_Camera *self)
+static PyObject *
+Camera_getType (BPy_Camera * self)
 {
-	PyObject *attr = PyInt_FromLong(self->camera->type);
+  PyObject *attr = PyInt_FromLong (self->camera->type);
 
-	if (attr) return attr;
+  if (attr)
+    return attr;
 
-	return EXPP_ReturnPyObjError (PyExc_RuntimeError,
-																	 "couldn't get Camera.type attribute");
+  return EXPP_ReturnPyObjError (PyExc_RuntimeError,
+				"couldn't get Camera.type attribute");
 }
 
-static PyObject *Camera_getMode(BPy_Camera *self)
+static PyObject *
+Camera_getMode (BPy_Camera * self)
 {
-	PyObject *attr = PyInt_FromLong(self->camera->flag);
+  PyObject *attr = PyInt_FromLong (self->camera->flag);
 
-	if (attr) return attr;
+  if (attr)
+    return attr;
 
-	return EXPP_ReturnPyObjError (PyExc_RuntimeError,
-																	 "couldn't get Camera.Mode attribute");
+  return EXPP_ReturnPyObjError (PyExc_RuntimeError,
+				"couldn't get Camera.Mode attribute");
 }
 
-static PyObject *Camera_getLens(BPy_Camera *self)
+static PyObject *
+Camera_getLens (BPy_Camera * self)
 {
-	PyObject *attr = PyFloat_FromDouble(self->camera->lens);
+  PyObject *attr = PyFloat_FromDouble (self->camera->lens);
 
-	if (attr) return attr;
+  if (attr)
+    return attr;
 
-	return EXPP_ReturnPyObjError (PyExc_RuntimeError,
-																	 "couldn't get Camera.lens attribute");
+  return EXPP_ReturnPyObjError (PyExc_RuntimeError,
+				"couldn't get Camera.lens attribute");
 }
 
-static PyObject *Camera_getClipStart(BPy_Camera *self)
+static PyObject *
+Camera_getClipStart (BPy_Camera * self)
 {
-	PyObject *attr = PyFloat_FromDouble(self->camera->clipsta);
+  PyObject *attr = PyFloat_FromDouble (self->camera->clipsta);
 
-	if (attr) return attr;
+  if (attr)
+    return attr;
 
-	return EXPP_ReturnPyObjError (PyExc_RuntimeError,
-																	 "couldn't get Camera.clipStart attribute");
+  return EXPP_ReturnPyObjError (PyExc_RuntimeError,
+				"couldn't get Camera.clipStart attribute");
 }
 
-static PyObject *Camera_getClipEnd(BPy_Camera *self)
+static PyObject *
+Camera_getClipEnd (BPy_Camera * self)
 {
-	PyObject *attr = PyFloat_FromDouble(self->camera->clipend);
+  PyObject *attr = PyFloat_FromDouble (self->camera->clipend);
 
-	if (attr) return attr;
+  if (attr)
+    return attr;
 
-	return EXPP_ReturnPyObjError (PyExc_RuntimeError,
-																	 "couldn't get Camera.clipEnd attribute");
+  return EXPP_ReturnPyObjError (PyExc_RuntimeError,
+				"couldn't get Camera.clipEnd attribute");
 }
 
-static PyObject *Camera_getDrawSize(BPy_Camera *self)
+static PyObject *
+Camera_getDrawSize (BPy_Camera * self)
 {
-	PyObject *attr = PyFloat_FromDouble(self->camera->drawsize);
+  PyObject *attr = PyFloat_FromDouble (self->camera->drawsize);
 
-	if (attr) return attr;
+  if (attr)
+    return attr;
 
-	return EXPP_ReturnPyObjError (PyExc_RuntimeError,
-																	 "couldn't get Camera.drawSize attribute");
+  return EXPP_ReturnPyObjError (PyExc_RuntimeError,
+				"couldn't get Camera.drawSize attribute");
 }
 
 
 
-static PyObject *Camera_setIpo(BPy_Camera *self, PyObject *args)
+static PyObject *
+Camera_setIpo (BPy_Camera * self, PyObject * args)
 {
-	PyObject *pyipo = 0;
-	Ipo *ipo = NULL;
-	Ipo *oldipo;
+  PyObject *pyipo = 0;
+  Ipo *ipo = NULL;
+  Ipo *oldipo;
 
-	if (!PyArg_ParseTuple(args, "O!", &Ipo_Type, &pyipo))
-		return EXPP_ReturnPyObjError (PyExc_TypeError, "expected Ipo as argument");
+  if (!PyArg_ParseTuple (args, "O!", &Ipo_Type, &pyipo))
+    return EXPP_ReturnPyObjError (PyExc_TypeError,
+				  "expected Ipo as argument");
 
-	ipo = Ipo_FromPyObject(pyipo);
+  ipo = Ipo_FromPyObject (pyipo);
 
-	if (!ipo) return EXPP_ReturnPyObjError (PyExc_RuntimeError, "null ipo!");
+  if (!ipo)
+    return EXPP_ReturnPyObjError (PyExc_RuntimeError, "null ipo!");
 
-	if (ipo->blocktype != ID_CA)
-		return EXPP_ReturnPyObjError (PyExc_TypeError,
-			"this ipo is not a camera data ipo");
+  if (ipo->blocktype != ID_CA)
+    return EXPP_ReturnPyObjError (PyExc_TypeError,
+				  "this ipo is not a camera data ipo");
 
-	oldipo = self->camera->ipo;
-	if (oldipo) {
-		ID *id = &oldipo->id;
-		if (id->us > 0) id->us--;
-	}
+  oldipo = self->camera->ipo;
+  if (oldipo)
+    {
+      ID *id = &oldipo->id;
+      if (id->us > 0)
+	id->us--;
+    }
 
-	((ID *)&ipo->id)->us++;
+  ((ID *) & ipo->id)->us++;
 
-	self->camera->ipo = ipo;
+  self->camera->ipo = ipo;
 
-	Py_INCREF(Py_None);
-	return Py_None;
+  Py_INCREF (Py_None);
+  return Py_None;
 }
 
-static PyObject *Camera_clearIpo(BPy_Camera *self)
+static PyObject *
+Camera_clearIpo (BPy_Camera * self)
 {
-	Camera *cam = self->camera;
-	Ipo *ipo = (Ipo *)cam->ipo;
+  Camera *cam = self->camera;
+  Ipo *ipo = (Ipo *) cam->ipo;
 
-	if (ipo) {
-		ID *id = &ipo->id;
-		if (id->us > 0) id->us--;
-		cam->ipo = NULL;
+  if (ipo)
+    {
+      ID *id = &ipo->id;
+      if (id->us > 0)
+	id->us--;
+      cam->ipo = NULL;
 
-		Py_INCREF (Py_True);
-		return Py_True;
-	}
+      Py_INCREF (Py_True);
+      return Py_True;
+    }
 
-	Py_INCREF (Py_False); /* no ipo found */
-	return Py_False;
+  Py_INCREF (Py_False);		/* no ipo found */
+  return Py_False;
 }
 
-static PyObject *Camera_setName(BPy_Camera *self, PyObject *args)
+static PyObject *
+Camera_setName (BPy_Camera * self, PyObject * args)
 {
-	char *name;
-	char buf[21];
+  char *name;
+  char buf[21];
 
-	if (!PyArg_ParseTuple(args, "s", &name))
-		return EXPP_ReturnPyObjError (PyExc_TypeError,
-																		 "expected string argument");
+  if (!PyArg_ParseTuple (args, "s", &name))
+    return EXPP_ReturnPyObjError (PyExc_TypeError,
+				  "expected string argument");
 
-	PyOS_snprintf(buf, sizeof(buf), "%s", name);
+  PyOS_snprintf (buf, sizeof (buf), "%s", name);
 
-	rename_id(&self->camera->id, buf);
+  rename_id (&self->camera->id, buf);
 
-	Py_INCREF(Py_None);
-	return Py_None;
+  Py_INCREF (Py_None);
+  return Py_None;
 }
 
-static PyObject *Camera_setType(BPy_Camera *self, PyObject *args)
+static PyObject *
+Camera_setType (BPy_Camera * self, PyObject * args)
 {
-	char *type;
-
-	if (!PyArg_ParseTuple(args, "s", &type))
-		return EXPP_ReturnPyObjError (PyExc_TypeError,
-																		 "expected string argument");
-
-	if (strcmp (type, "persp") == 0)
-		self->camera->type = (short)EXPP_CAM_TYPE_PERSP;
-	else if (strcmp (type, "ortho") == 0)
-		self->camera->type = (short)EXPP_CAM_TYPE_ORTHO;	
-	else
-		return EXPP_ReturnPyObjError (PyExc_AttributeError,
-																		 "unknown camera type");
-
-	Py_INCREF(Py_None);
-	return Py_None;
+  char *type;
+
+  if (!PyArg_ParseTuple (args, "s", &type))
+    return EXPP_ReturnPyObjError (PyExc_TypeError,
+				  "expected string argument");
+
+  if (strcmp (type, "persp") == 0)
+    self->camera->type = (short) EXPP_CAM_TYPE_PERSP;
+  else if (strcmp (type, "ortho") == 0)
+    self->camera->type = (short) EXPP_CAM_TYPE_ORTHO;
+  else
+    return EXPP_ReturnPyObjError (PyExc_AttributeError,
+				  "unknown camera type");
+
+  Py_INCREF (Py_None);
+  return Py_None;
 }
 
 /* This one is 'private'. It is not really a method, just a helper function for
@@ -428,198 +597,217 @@ static PyObject *Camera_setType(BPy_Camera *self, PyObject *args)
  * the method setType expects a string ('persp' or 'ortho') or an empty
  * argument, this function should receive an int (0 or 1). */
 
-static PyObject *Camera_setIntType(BPy_Camera *self, PyObject *args)
+static PyObject *
+Camera_setIntType (BPy_Camera * self, PyObject * args)
 {
-	short value;
+  short value;
 
-	if (!PyArg_ParseTuple(args, "h", &value))
-		return EXPP_ReturnPyObjError (PyExc_TypeError,
-																		 "expected int argument: 0 or 1");
+  if (!PyArg_ParseTuple (args, "h", &value))
+    return EXPP_ReturnPyObjError (PyExc_TypeError,
+				  "expected int argument: 0 or 1");
 
-	if (value == 0 || value == 1)
-		self->camera->type = value;
-	else
-		return EXPP_ReturnPyObjError (PyExc_ValueError,
-																		 "expected int argument: 0 or 1");
+  if (value == 0 || value == 1)
+    self->camera->type = value;
+  else
+    return EXPP_ReturnPyObjError (PyExc_ValueError,
+				  "expected int argument: 0 or 1");
 
-	Py_INCREF(Py_None);
-	return Py_None;
+  Py_INCREF (Py_None);
+  return Py_None;
 }
 
-static PyObject *Camera_setMode(BPy_Camera *self, PyObject *args)
+static PyObject *
+Camera_setMode (BPy_Camera * self, PyObject * args)
 {
-	char *mode_str1 = NULL, *mode_str2 = NULL;
-	short flag = 0;
-
-	if (!PyArg_ParseTuple(args, "|ss", &mode_str1, &mode_str2))
-		return EXPP_ReturnPyObjError (PyExc_AttributeError,
-						"expected one or two strings as arguments");
-	
-	if (mode_str1 != NULL) {
-		if (strcmp(mode_str1, "showLimits") == 0)
-			flag |= (short)EXPP_CAM_MODE_SHOWLIMITS;
-		else if (strcmp(mode_str1, "showMist") == 0)
-			flag |= (short)EXPP_CAM_MODE_SHOWMIST;
-		else
-			return EXPP_ReturnPyObjError (PyExc_AttributeError,
-															"first argument is an unknown camera flag");
-
-		if (mode_str2 != NULL) {
-			if (strcmp(mode_str2, "showLimits") == 0)
-				flag |= (short)EXPP_CAM_MODE_SHOWLIMITS;
-			else if (strcmp(mode_str2, "showMist") == 0)
-				flag |= (short)EXPP_CAM_MODE_SHOWMIST;
-			else
-				return EXPP_ReturnPyObjError (PyExc_AttributeError,
-															"second argument is an unknown camera flag");
-		}
+  char *mode_str1 = NULL, *mode_str2 = NULL;
+  short flag = 0;
+
+  if (!PyArg_ParseTuple (args, "|ss", &mode_str1, &mode_str2))
+    return EXPP_ReturnPyObjError (PyExc_AttributeError,
+				  "expected one or two strings as arguments");
+
+  if (mode_str1 != NULL)
+    {
+      if (strcmp (mode_str1, "showLimits") == 0)
+	flag |= (short) EXPP_CAM_MODE_SHOWLIMITS;
+      else if (strcmp (mode_str1, "showMist") == 0)
+	flag |= (short) EXPP_CAM_MODE_SHOWMIST;
+      else
+	return EXPP_ReturnPyObjError (PyExc_AttributeError,
+				      "first argument is an unknown camera flag");
+
+      if (mode_str2 != NULL)
+	{
+	  if (strcmp (mode_str2, "showLimits") == 0)
+	    flag |= (short) EXPP_CAM_MODE_SHOWLIMITS;
+	  else if (strcmp (mode_str2, "showMist") == 0)
+	    flag |= (short) EXPP_CAM_MODE_SHOWMIST;
+	  else
+	    return EXPP_ReturnPyObjError (PyExc_AttributeError,
+					  "second argument is an unknown camera flag");
 	}
+    }
 
-	self->camera->flag = flag;
+  self->camera->flag = flag;
 
-	Py_INCREF(Py_None);
-	return Py_None;
+  Py_INCREF (Py_None);
+  return Py_None;
 }
 
 /* Another helper function, for the same reason.
  * (See comment before Camera_setIntType above). */
 
-static PyObject *Camera_setIntMode(BPy_Camera *self, PyObject *args)
+static PyObject *
+Camera_setIntMode (BPy_Camera * self, PyObject * args)
 {
-	short value;
+  short value;
 
-	if (!PyArg_ParseTuple(args, "h", &value))
-		return EXPP_ReturnPyObjError (PyExc_TypeError,
-																		 "expected int argument in [0,3]");
+  if (!PyArg_ParseTuple (args, "h", &value))
+    return EXPP_ReturnPyObjError (PyExc_TypeError,
+				  "expected int argument in [0,3]");
 
-	if (value >= 0 && value <= 3)
-		self->camera->flag = value;
-	else
-		return EXPP_ReturnPyObjError (PyExc_ValueError,
-																		 "expected int argument in [0,3]");
+  if (value >= 0 && value <= 3)
+    self->camera->flag = value;
+  else
+    return EXPP_ReturnPyObjError (PyExc_ValueError,
+				  "expected int argument in [0,3]");
 
-	Py_INCREF(Py_None);
-	return Py_None;
+  Py_INCREF (Py_None);
+  return Py_None;
 }
 
-static PyObject *Camera_setLens(BPy_Camera *self, PyObject *args)
+static PyObject *
+Camera_setLens (BPy_Camera * self, PyObject * args)
 {
-	float value;
-	
-	if (!PyArg_ParseTuple(args, "f", &value))
-		return EXPP_ReturnPyObjError (PyExc_TypeError,
-																		 "expected float argument");
- 
-	self->camera->lens = EXPP_ClampFloat (value,
-									EXPP_CAM_LENS_MIN, EXPP_CAM_LENS_MAX);
-	
-	Py_INCREF(Py_None);
-	return Py_None;
-}
+  float value;
 
-static PyObject *Camera_setClipStart(BPy_Camera *self, PyObject *args)
-{
-	float value;
-	
-	if (!PyArg_ParseTuple(args, "f", &value))
-		return EXPP_ReturnPyObjError (PyExc_TypeError,
-																		 "expected float argument");
-
-	self->camera->clipsta = EXPP_ClampFloat (value,
-									EXPP_CAM_CLIPSTART_MIN, EXPP_CAM_CLIPSTART_MAX);
-	
-	Py_INCREF(Py_None);
-	return Py_None;
+  if (!PyArg_ParseTuple (args, "f", &value))
+    return EXPP_ReturnPyObjError (PyExc_TypeError, "expected float argument");
+
+  self->camera->lens = EXPP_ClampFloat (value,
+					EXPP_CAM_LENS_MIN, EXPP_CAM_LENS_MAX);
+
+  Py_INCREF (Py_None);
+  return Py_None;
 }
 
-static PyObject *Camera_setClipEnd(BPy_Camera *self, PyObject *args)
+static PyObject *
+Camera_setClipStart (BPy_Camera * self, PyObject * args)
 {
-	float value;
-	
-	if (!PyArg_ParseTuple(args, "f", &value))
-		return EXPP_ReturnPyObjError (PyExc_TypeError,
-																		 "expected float argument");
+  float value;
 
-	self->camera->clipend = EXPP_ClampFloat (value,
-									EXPP_CAM_CLIPEND_MIN, EXPP_CAM_CLIPEND_MAX);
+  if (!PyArg_ParseTuple (args, "f", &value))
+    return EXPP_ReturnPyObjError (PyExc_TypeError, "expected float argument");
 
-	Py_INCREF(Py_None);
-	return Py_None;
+  self->camera->clipsta = EXPP_ClampFloat (value,
+					   EXPP_CAM_CLIPSTART_MIN,
+					   EXPP_CAM_CLIPSTART_MAX);
+
+  Py_INCREF (Py_None);
+  return Py_None;
 }
 
-static PyObject *Camera_setDrawSize(BPy_Camera *self, PyObject *args)
+static PyObject *
+Camera_setClipEnd (BPy_Camera * self, PyObject * args)
 {
-	float value;
-	
-	if (!PyArg_ParseTuple(args, "f", &value))
-		return EXPP_ReturnPyObjError (PyExc_TypeError,
-																		 "expected a float number as argument");
+  float value;
 
-	self->camera->drawsize = EXPP_ClampFloat (value,
-									EXPP_CAM_DRAWSIZE_MIN, EXPP_CAM_DRAWSIZE_MAX);
+  if (!PyArg_ParseTuple (args, "f", &value))
+    return EXPP_ReturnPyObjError (PyExc_TypeError, "expected float argument");
 
-	Py_INCREF(Py_None);
-	return Py_None;
-}
+  self->camera->clipend = EXPP_ClampFloat (value,
+					   EXPP_CAM_CLIPEND_MIN,
+					   EXPP_CAM_CLIPEND_MAX);
 
-static void Camera_dealloc (BPy_Camera *self)
-{
-	PyObject_DEL (self);
+  Py_INCREF (Py_None);
+  return Py_None;
 }
 
-static PyObject *Camera_getAttr (BPy_Camera *self, char *name)
+static PyObject *
+Camera_setDrawSize (BPy_Camera * self, PyObject * args)
 {
-	PyObject *attr = Py_None;
-
-	if (strcmp(name, "name") == 0)
-		attr = PyString_FromString(self->camera->id.name+2);
-	else if (strcmp(name, "type") == 0)
-		attr = PyInt_FromLong(self->camera->type);
-	else if (strcmp(name, "mode") == 0)
-		attr = PyInt_FromLong(self->camera->flag);
-	else if (strcmp(name, "lens") == 0)
-		attr = PyFloat_FromDouble(self->camera->lens);
-	else if (strcmp(name, "clipStart") == 0)
-		attr = PyFloat_FromDouble(self->camera->clipsta);
-	else if (strcmp(name, "clipEnd") == 0)
-		attr = PyFloat_FromDouble(self->camera->clipend);
-	else if (strcmp(name, "drawSize") == 0)
-		attr = PyFloat_FromDouble(self->camera->drawsize);
-	else if (strcmp(name, "ipo") == 0) {
-		Ipo *ipo = self->camera->ipo;
-		if (ipo) attr = Ipo_CreatePyObject (ipo);
-	}
-
-	else if (strcmp(name, "Types") == 0) {
-		attr = Py_BuildValue("{s:h,s:h}", "persp", EXPP_CAM_TYPE_PERSP,
-																			"ortho", EXPP_CAM_TYPE_ORTHO);
-	}
+  float value;
 
-	else if (strcmp(name, "Modes") == 0) {
-		attr = Py_BuildValue("{s:h,s:h}", "showLimits", EXPP_CAM_MODE_SHOWLIMITS,
-																	"showMist", EXPP_CAM_MODE_SHOWMIST);
-	}
+  if (!PyArg_ParseTuple (args, "f", &value))
+    return EXPP_ReturnPyObjError (PyExc_TypeError,
+				  "expected a float number as argument");
 
-	else if (strcmp(name, "__members__") == 0) {
-		attr = Py_BuildValue("[s,s,s,s,s,s,s,s,s,s]",
-										"name", "type", "mode", "lens", "clipStart", "ipo",
-										"clipEnd", "drawSize", "Types", "Modes");
-	}
+  self->camera->drawsize = EXPP_ClampFloat (value,
+					    EXPP_CAM_DRAWSIZE_MIN,
+					    EXPP_CAM_DRAWSIZE_MAX);
 
-	if (!attr)
-		return EXPP_ReturnPyObjError (PyExc_MemoryError,
-											"couldn't create PyObject");
+  Py_INCREF (Py_None);
+  return Py_None;
+}
 
-	if (attr != Py_None) return attr; /* member attribute found, return it */
+static void
+Camera_dealloc (BPy_Camera * self)
+{
+  PyObject_DEL (self);
+}
 
-	/* not an attribute, search the methods table */
-	return Py_FindMethod(BPy_Camera_methods, (PyObject *)self, name);
+static PyObject *
+Camera_getAttr (BPy_Camera * self, char *name)
+{
+  PyObject *attr = Py_None;
+
+  if (strcmp (name, "name") == 0)
+    attr = PyString_FromString (self->camera->id.name + 2);
+  else if (strcmp (name, "type") == 0)
+    attr = PyInt_FromLong (self->camera->type);
+  else if (strcmp (name, "mode") == 0)
+    attr = PyInt_FromLong (self->camera->flag);
+  else if (strcmp (name, "lens") == 0)
+    attr = PyFloat_FromDouble (self->camera->lens);
+  else if (strcmp (name, "clipStart") == 0)
+    attr = PyFloat_FromDouble (self->camera->clipsta);
+  else if (strcmp (name, "clipEnd") == 0)
+    attr = PyFloat_FromDouble (self->camera->clipend);
+  else if (strcmp (name, "drawSize") == 0)
+    attr = PyFloat_FromDouble (self->camera->drawsize);
+  else if (strcmp (name, "ipo") == 0)
+    {
+      Ipo *ipo = self->camera->ipo;
+      if (ipo)
+	attr = Ipo_CreatePyObject (ipo);
+    }
+
+  else if (strcmp (name, "Types") == 0)
+    {
+      attr = Py_BuildValue ("{s:h,s:h}", "persp", EXPP_CAM_TYPE_PERSP,
+			    "ortho", EXPP_CAM_TYPE_ORTHO);
+    }
+
+  else if (strcmp (name, "Modes") == 0)
+    {
+      attr =
+	Py_BuildValue ("{s:h,s:h}", "showLimits", EXPP_CAM_MODE_SHOWLIMITS,
+		       "showMist", EXPP_CAM_MODE_SHOWMIST);
+    }
+
+  else if (strcmp (name, "__members__") == 0)
+    {
+      attr = Py_BuildValue ("[s,s,s,s,s,s,s,s,s,s]",
+			    "name", "type", "mode", "lens", "clipStart",
+			    "ipo", "clipEnd", "drawSize", "Types", "Modes");
+    }
+
+  if (!attr)
+    return EXPP_ReturnPyObjError (PyExc_MemoryError,
+				  "couldn't create PyObject");
+
+  if (attr != Py_None)
+    return attr;		/* member attribute found, return it */
+
+  /* not an attribute, search the methods table */
+  return Py_FindMethod (BPy_Camera_methods, (PyObject *) self, name);
 }
 
-static int Camera_setAttr (BPy_Camera *self, char *name, PyObject *value)
+static int
+Camera_setAttr (BPy_Camera * self, char *name, PyObject * value)
 {
-	PyObject *valtuple; 
-	PyObject *error = NULL;
+  PyObject *valtuple;
+  PyObject *error = NULL;
 
 /* We're playing a trick on the Python API users here.	Even if they use
  * Camera.member = val instead of Camera.setMember(val), we end up using the
@@ -628,60 +816,63 @@ static int Camera_setAttr (BPy_Camera *self, char *name, PyObject *value)
 
 /* First we put "value" in a tuple, because we want to pass it to functions
  * that only accept PyTuples. */
-	valtuple = Py_BuildValue("(O)", value);
+  valtuple = Py_BuildValue ("(O)", value);
 
-	if (!valtuple) /* everything OK with our PyObject? */
-		return EXPP_ReturnIntError(PyExc_MemoryError,
-												 "CameraSetAttr: couldn't create PyTuple");
+  if (!valtuple)		/* everything OK with our PyObject? */
+    return EXPP_ReturnIntError (PyExc_MemoryError,
+				"CameraSetAttr: couldn't create PyTuple");
 
 /* Now we just compare "name" with all possible BPy_Camera member variables */
-	if (strcmp (name, "name") == 0)
-		error = Camera_setName (self, valtuple);
-	else if (strcmp (name, "type") == 0)
-		error = Camera_setIntType (self, valtuple); /* special case */
-	else if (strcmp (name, "mode") == 0)
-		error = Camera_setIntMode (self, valtuple); /* special case */
-	else if (strcmp (name, "lens") == 0)
-		error = Camera_setLens (self, valtuple);
-	else if (strcmp (name, "clipStart") == 0)
-		error = Camera_setClipStart (self, valtuple);
-	else if (strcmp (name, "clipEnd") == 0)
-		error = Camera_setClipEnd (self, valtuple);
-	else if (strcmp (name, "drawSize") == 0)
-		error = Camera_setDrawSize (self, valtuple);
-
-	else { /* Error */
-		Py_DECREF(valtuple);
-
-		if ((strcmp (name, "Types") == 0) || /* user tried to change a */
-				(strcmp (name, "Modes") == 0))	 /* constant dict type ... */
-			return EXPP_ReturnIntError (PyExc_AttributeError,
-									 "constant dictionary -- cannot be changed");
-
-		else /* ... or no member with the given name was found */
-			return EXPP_ReturnIntError (PyExc_KeyError,
-									 "attribute not found");
-	}
+  if (strcmp (name, "name") == 0)
+    error = Camera_setName (self, valtuple);
+  else if (strcmp (name, "type") == 0)
+    error = Camera_setIntType (self, valtuple);	/* special case */
+  else if (strcmp (name, "mode") == 0)
+    error = Camera_setIntMode (self, valtuple);	/* special case */
+  else if (strcmp (name, "lens") == 0)
+    error = Camera_setLens (self, valtuple);
+  else if (strcmp (name, "clipStart") == 0)
+    error = Camera_setClipStart (self, valtuple);
+  else if (strcmp (name, "clipEnd") == 0)
+    error = Camera_setClipEnd (self, valtuple);
+  else if (strcmp (name, "drawSize") == 0)
+    error = Camera_setDrawSize (self, valtuple);
+
+  else
+    {				/* Error */
+      Py_DECREF (valtuple);
+
+      if ((strcmp (name, "Types") == 0) ||	/* user tried to change a */
+	  (strcmp (name, "Modes") == 0))	/* constant dict type ... */
+	return EXPP_ReturnIntError (PyExc_AttributeError,
+				    "constant dictionary -- cannot be changed");
+
+      else			/* ... or no member with the given name was found */
+	return EXPP_ReturnIntError (PyExc_KeyError, "attribute not found");
+    }
 
 /* valtuple won't be returned to the caller, so we need to DECREF it */
-	Py_DECREF (valtuple);
+  Py_DECREF (valtuple);
 
-	if (error != Py_None) return -1;
+  if (error != Py_None)
+    return -1;
 
 /* Py_None was incref'ed by the called Camera_set* function. We probably
  * don't need to decref Py_None (!), but since Python/C API manual tells us
  * to treat it like any other PyObject regarding ref counting ... */
-	Py_DECREF (Py_None);
-	return 0; /* normal exit */
+  Py_DECREF (Py_None);
+  return 0;			/* normal exit */
 }
 
-static int Camera_compare (BPy_Camera *a, BPy_Camera *b)
+static int
+Camera_compare (BPy_Camera * a, BPy_Camera * b)
 {
-	Camera *pa = a->camera, *pb = b->camera;
-	return (pa == pb) ? 0:-1;
+  Camera *pa = a->camera, *pb = b->camera;
+  return (pa == pb) ? 0 : -1;
 }
 
-static PyObject *Camera_repr (BPy_Camera *self)
+static PyObject *
+Camera_repr (BPy_Camera * self)
 {
-	return PyString_FromFormat("[Camera \"%s\"]", self->camera->id.name+2);
+  return PyString_FromFormat ("[Camera \"%s\"]", self->camera->id.name + 2);
 }