[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20140] branches/blender2.5/blender/source /blender: 2.5

[Joshua Leung]

Revision: 20140
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20140
Author:   aligorith
Date:     2009-05-11 04:26:18 +0200 (Mon, 11 May 2009)

Log Message:
-----------
2.5

* Broke compiling on previous fix...
* Starting fix for nestled structs...

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c

Modified: branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/keyframing.c	2009-05-11 02:07:40 UTC (rev 20139)
+++ branches/blender2.5/blender/source/blender/editors/animation/keyframing.c	2009-05-11 02:26:18 UTC (rev 20140)
@@ -29,6 +29,7 @@
 #include "BKE_action.h"
 #include "BKE_constraint.h"
 #include "BKE_fcurve.h"
+#include "BKE_global.h"
 #include "BKE_utildefines.h"
 #include "BKE_context.h"
 #include "BKE_report.h"

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c	2009-05-11 02:07:40 UTC (rev 20139)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c	2009-05-11 02:26:18 UTC (rev 20140)
@@ -1718,10 +1718,18 @@
 		return NULL;
 	
 	if(!RNA_struct_is_ID(ptr->type)) {
-		if(ptr->type->path)
-			ptrpath= ptr->type->path(ptr);
-		else
-			return NULL;
+		if(ptr->type && ptr->type->nested) {
+			//StructRNA *nestedType= ptr->type->nested;
+			
+			printf("RNA - struct is nested \n");
+			// TODO: how do we get the identifier of the way this is nested into the main?
+		}
+		else {
+			if(ptr->type->path)
+				ptrpath= ptr->type->path(ptr);
+			else
+				return NULL;
+		}
 	}
 
 	propname= RNA_property_identifier(prop);