diff options
author | Joshua Leung <aligorith@gmail.com> | 2009-05-11 06:26:18 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2009-05-11 06:26:18 +0400 |
commit | 8e3356793a24994c1188aabfb57cb2feca20daf5 (patch) | |
tree | c2323fca0572b20bf1c20d09df0d3f22eaeb7557 /source/blender | |
parent | 5c96cd0319c759555175e37be5c3dcd162fe01d8 (diff) |
2.5
* Broke compiling on previous fix...
* Starting fix for nestled structs...
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/animation/keyframing.c | 1 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_access.c | 16 |
2 files changed, 13 insertions, 4 deletions
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index f7a16f63691..fb85099bf58 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -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" diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index 4d2302f1c06..fe6f4c13d9b 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -1718,10 +1718,18 @@ char *RNA_path_from_ID_to_property(PointerRNA *ptr, PropertyRNA *prop) 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); |