[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33363] branches/blender2.4/source/blender /python/api2_2x: patch [#24917] Ipo curves of particles are not exported to python

Campbell Barton ideasman42 at gmail.com
Sun Nov 28 14:59:29 CET 2010


Revision: 33363
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33363
Author:   campbellbarton
Date:     2010-11-28 14:59:29 +0100 (Sun, 28 Nov 2010)

Log Message:
-----------
patch [#24917] Ipo curves of particles are not exported to python
from Daniel Fiser (danfis) 

Modified Paths:
--------------
    branches/blender2.4/source/blender/python/api2_2x/Ipo.c
    branches/blender2.4/source/blender/python/api2_2x/Ipocurve.c

Modified: branches/blender2.4/source/blender/python/api2_2x/Ipo.c
===================================================================
--- branches/blender2.4/source/blender/python/api2_2x/Ipo.c	2010-11-28 13:39:39 UTC (rev 33362)
+++ branches/blender2.4/source/blender/python/api2_2x/Ipo.c	2010-11-28 13:59:29 UTC (rev 33363)
@@ -56,6 +56,7 @@
 extern int seq_ar[];
 extern int te_ar[];
 extern int wo_ar[];
+extern int part_ar[];
 
 PyObject *submodule;
 
@@ -303,6 +304,11 @@
 		vals = seq_ar;
 		size = SEQ_TOTIPO;
 		break;
+    case ID_PA:
+        lookup_name = (namefunc)getname_part_ei;
+        vals = part_ar;
+        size = PART_TOTIPO;
+        break;
 	}
 
 	desc = PyDescr_NewGetSet( &Ipo_Type, &BPy_Ipocurve_getseter );
@@ -517,6 +523,11 @@
 		adrcodes = seq_ar;
 		size = SEQ_TOTIPO;
 		break;
+    case ID_PA:
+        lookup_name = (namefunc)getname_part_ei;
+        adrcodes = part_ar;
+        size = PART_TOTIPO;
+        break;
 	case ID_KE:	/* shouldn't happen */
 	default:
 		return -1;
@@ -621,6 +632,10 @@
 		adrcodes = seq_ar;
 		size = SEQ_TOTIPO;
 		break;
+    case ID_PA:
+        adrcodes = part_ar;
+        size = PART_TOTIPO;
+        break;
 	case ID_KE:
 	default:
 		return -1;
@@ -699,6 +714,8 @@
 		idcode = ID_CO;
 	else if( !strcmp( code, "Sequence" ) )
 		idcode = ID_SEQ;
+	else if( !strcmp( code, "Particle" ) )
+		idcode = ID_PA;
 	else if( !strcmp( code, "Curve" ) )
 		idcode = ID_CU;
 	else if( !strcmp( code, "Key" ) )
@@ -1094,6 +1111,12 @@
 		size = SEQ_TOTIPO;
 		strcpy( name, "SQ_" );
 		break;
+	case ID_PA:
+		lookup_name = (namefunc)getname_part_ei;
+		vals = part_ar;
+		size = PART_TOTIPO;
+		strcpy( name, "PA_" );
+		break;
 	case ID_KE:
 		{
 			Key *key;
@@ -1155,7 +1178,7 @@
 
 	unsigned int i = 0;
 	static short curvelist[] = {
-		ID_OB, ID_MA, ID_CA, ID_LA, ID_TE, ID_WO, ID_PO, ID_CO, ID_CU, ID_SEQ
+		ID_OB, ID_MA, ID_CA, ID_LA, ID_TE, ID_WO, ID_PO, ID_CO, ID_CU, ID_SEQ, ID_PA
 	};
 
 	for( i = 0; i < sizeof(curvelist)/sizeof(short); ++i ) {
@@ -1220,6 +1243,12 @@
 			size = SEQ_TOTIPO;
 			strcpy( name, "SQ_" );
 			break;
+		case ID_PA:
+			lookup_name = (namefunc)getname_part_ei;
+			vals = part_ar;
+			size = PART_TOTIPO;
+			strcpy( name, "PA_" );
+			break;
 		}
 
 		while( size-- ) {
@@ -1297,6 +1326,8 @@
 		param = "Curve"; break;
 	case ID_SEQ:
 		param = "Sequence"; break;
+	case ID_PA:
+		param = "Particle"; break;
 	case ID_KE:
 		param = "Key"; break;
 	default:

Modified: branches/blender2.4/source/blender/python/api2_2x/Ipocurve.c
===================================================================
--- branches/blender2.4/source/blender/python/api2_2x/Ipocurve.c	2010-11-28 13:39:39 UTC (rev 33362)
+++ branches/blender2.4/source/blender/python/api2_2x/Ipocurve.c	2010-11-28 13:59:29 UTC (rev 33363)
@@ -362,6 +362,8 @@
 		return get_key_curvename( icu );
 	case ID_SEQ:
 		return getname_seq_ei( icu->adrcode );
+	case ID_PA:
+		return getname_part_ei( icu->adrcode );
 	case ID_CO:
 		return getname_co_ei( icu->adrcode );
 	}
@@ -630,6 +632,9 @@
 	case ID_SEQ:
 		return PyString_FromString( getname_seq_ei
 					    ( self->ipocurve->adrcode ) );
+	case ID_PA:
+		return PyString_FromString( getname_part_ei
+					    ( self->ipocurve->adrcode ) );
 	case ID_CO:
 		return PyString_FromString( getname_co_ei
 					    ( self->ipocurve->adrcode ) );





More information about the Bf-blender-cvs mailing list