diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-04-24 02:08:18 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-04-24 02:08:18 +0400 |
| commit | bd860f89e75a10cae56be31f97fcd6aa9eb13b8e (patch) | |
| tree | 4ad82db39475b754b9bb4c1c439033ce46e0c62e /source/blender/makesrna/intern/rna_internal.h | |
| parent | 2497af95a11122e6c30d42dd7bff5d8f239269ac (diff) | |
| parent | 040a049fb17af2e690219ec7f48f601a6d2189c4 (diff) | |
Merged changes in the trunk up to revision 36301.
Diffstat (limited to 'source/blender/makesrna/intern/rna_internal.h')
| -rw-r--r-- | source/blender/makesrna/intern/rna_internal.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h index 70f3deb6e13..7df31fc12f9 100644 --- a/source/blender/makesrna/intern/rna_internal.h +++ b/source/blender/makesrna/intern/rna_internal.h @@ -223,6 +223,9 @@ int rna_Curve_object_poll(struct PointerRNA *ptr, struct PointerRNA value); int rna_Lattice_object_poll(struct PointerRNA *ptr, struct PointerRNA value); int rna_Mesh_object_poll(struct PointerRNA *ptr, struct PointerRNA value); +/* basic poll functions for actions (to prevent actions getting set in wrong places) */ +int rna_Action_id_poll(struct PointerRNA *ptr, struct PointerRNA value); +int rna_Action_actedit_assign_poll(struct PointerRNA *ptr, struct PointerRNA value); char *rna_TextureSlot_path(struct PointerRNA *ptr); |