diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-11 16:50:05 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-11 16:50:05 +0400 |
commit | 1c390fb60d9092bb6e5ea1c9ba7d84f53f16176a (patch) | |
tree | a36e69fbe21d7f906edbbcad6286f589cfc78102 /source/blender/makesdna | |
parent | cca55e5c582cad61580ac2a210789ddbaf0c264c (diff) |
Tiles branch:
* Fix OpenCL not being found on Mac OS X.
* Fix merge error in tracking.c
* Node/RNA naming capitalization and underscore consistency.
* Add missing license headers in opencl files.
* Remove unneeded COM_defines.h.trunk file.
* Various code style consistency fixes.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index 501ed6a316d..eb6a1ebdbe2 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -339,6 +339,7 @@ typedef struct NodeImageAnim { char cyclic, movie; short pad; } NodeImageAnim; + typedef struct NodeRenderlayerData { int offsetx; int offsety; |