[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13427] trunk/blender/source/blender/ python/api2_2x: some bugs with previous renderlayer api

[Campbell Barton]

Revision: 13427
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13427
Author:   campbellbarton
Date:     2008-01-28 01:07:59 +0100 (Mon, 28 Jan 2008)

Log Message:
-----------
some bugs with previous renderlayer api

Modified Paths:
--------------
    trunk/blender/source/blender/python/api2_2x/sceneRender.c
    trunk/blender/source/blender/python/api2_2x/sceneRender.h

Modified: trunk/blender/source/blender/python/api2_2x/sceneRender.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/sceneRender.c	2008-01-28 00:05:15 UTC (rev 13426)
+++ trunk/blender/source/blender/python/api2_2x/sceneRender.c	2008-01-28 00:07:59 UTC (rev 13427)
@@ -1776,7 +1776,7 @@
 	list = PyList_New(0);
 	
 	for(srl= self->renderContext->layers.first; srl; srl= srl->next) {	
-		layer = RenderLayer_CreatePyObject( srl );
+		layer = RenderLayer_CreatePyObject( self->scene, srl );
 		PyList_Append(list, layer);
 		Py_DECREF(layer);
 	}
@@ -1821,7 +1821,7 @@
 
 PyObject *RenderData_addRenderLayer(BPy_RenderData * self ) {
 	scene_add_render_layer(self->scene);
-	return RenderLayer_CreatePyObject( self->renderContext->layers.last );
+	return RenderLayer_CreatePyObject( self->scene, self->renderContext->layers.last );
 	
 }
 
@@ -3209,9 +3209,9 @@
 	
 	laymask = ( unsigned int )PyInt_AS_LONG( value );
 	
-	if( laymask <= 0 )
+	if((laymask < 0) ||  (!zlay && laymask == 0))
 		return EXPP_ReturnIntError( PyExc_ValueError,
-					      "layer value cannot be zero or below" );
+					      "layer value too low" );
 	
 	if (zlay) {
 		self->renderLayer->lay_zmask= laymask & ((1<<20) - 1);
@@ -3569,7 +3569,7 @@
 /* BPy_RenderData Callbacks                                                */
 /***************************************************************************/
 
-PyObject *RenderLayer_CreatePyObject( struct SceneRenderLayer * renderLayer )
+PyObject *RenderLayer_CreatePyObject( struct Scene * scene, struct SceneRenderLayer * renderLayer )
 {
 	BPy_RenderLayer *py_renderlayer;
 
@@ -3581,6 +3581,7 @@
 		return ( NULL );
 	}
 	py_renderlayer->renderLayer = renderLayer;
+	py_renderlayer->scene = scene;
 
 	return ( ( PyObject * ) py_renderlayer );
 }

Modified: trunk/blender/source/blender/python/api2_2x/sceneRender.h
===================================================================
--- trunk/blender/source/blender/python/api2_2x/sceneRender.h	2008-01-28 00:05:15 UTC (rev 13426)
+++ trunk/blender/source/blender/python/api2_2x/sceneRender.h	2008-01-28 00:07:59 UTC (rev 13427)
@@ -58,5 +58,5 @@
 PyObject *Render_Init( void );
 
 PyObject *RenderData_CreatePyObject( struct Scene *scene );
-PyObject *RenderLayer_CreatePyObject( struct SceneRenderLayer * renderLayer );
+PyObject *RenderLayer_CreatePyObject( struct Scene *scene, struct SceneRenderLayer * renderLayer );
 #endif				/* EXPP_SCENERENDER_H */