diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-25 05:26:45 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-25 05:26:45 +0400 |
| commit | 9ca7f6659f5f316392901fc9607a0dc4e2e373b4 (patch) | |
| tree | 1cf3771a0a4e756baee494da0818d4dd08cc9ce9 /source/blender/makesrna/RNA_access.h | |
| parent | 9f243d531cb2629625d02e4290549b9e6ba76933 (diff) | |
| parent | 2d8227f20400767bcf0fbb0877a055534d8a99ff (diff) | |
Merged changes in the trunk up to revision 44419.
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/drawobject.c
source/creator/CMakeLists.txt
Diffstat (limited to 'source/blender/makesrna/RNA_access.h')
| -rw-r--r-- | source/blender/makesrna/RNA_access.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h index 2232655afae..d39105f3c9d 100644 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@ -382,6 +382,7 @@ extern StructRNA RNA_NlaTrack; extern StructRNA RNA_Node; extern StructRNA RNA_NodeForLoop; extern StructRNA RNA_NodeGroup; +extern StructRNA RNA_NodeImageMultiFileSocket; extern StructRNA RNA_NodeLink; extern StructRNA RNA_NodeSocket; extern StructRNA RNA_NodeSocketPanel; |