diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-10 08:17:43 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-10 08:17:43 +0400 |
commit | 121ff4223dbd5c42ecc4919d09ce464d01faf4e7 (patch) | |
tree | 5102e8d4f18a142aaff07fc355d0fd0208ccf651 /source/blender/makesrna/RNA_access.h | |
parent | a96c3ce9e0a61bc29fef8212a742658795aabbed (diff) | |
parent | 77c51607914b7fe4744437f6d47fedab628b444d (diff) |
svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build
Diffstat (limited to 'source/blender/makesrna/RNA_access.h')
-rw-r--r-- | source/blender/makesrna/RNA_access.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h index 665215b6592..e83fc143ef1 100644 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@ -625,6 +625,8 @@ StructRNA *RNA_struct_base(StructRNA *type); int RNA_struct_is_ID(StructRNA *type); int RNA_struct_is_a(StructRNA *type, StructRNA *srna); +int RNA_struct_undo_check(StructRNA *type); + StructRegisterFunc RNA_struct_register(StructRNA *type); StructUnregisterFunc RNA_struct_unregister(StructRNA *type); void **RNA_struct_instance(PointerRNA *ptr); |