diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-11 18:14:04 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-11 18:14:04 +0400 |
| commit | b308e613126f8c89e954705aa512a3ef6a1f551d (patch) | |
| tree | 4a875450b2ba9766fbdf4914e8cb003e8132497c /source/blender/makesdna/DNA_userdef_types.h | |
| parent | 98bdf0274b1052efe25b6216f488d2a40fa43d1c (diff) | |
| parent | cda5d1769d71832a6b04ed6c91bac101c482e5f7 (diff) | |
svn merge ^/trunk/blender -r43220:43278 --accept postpone
Diffstat (limited to 'source/blender/makesdna/DNA_userdef_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index b3398460500..fc418069c5c 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -413,6 +413,9 @@ typedef struct UserDef { short pad3; char author[80]; /* author name for file formats supporting it */ + + int compute_device_type; + int compute_device_id; } UserDef; extern UserDef U; /* from blenkernel blender.c */ @@ -627,6 +630,10 @@ extern UserDef U; /* from blenkernel blender.c */ #define NDOF_PANY_INVERT_AXIS (1 << 13) #define NDOF_PANZ_INVERT_AXIS (1 << 14) +/* compute_device_type */ +#define USER_COMPUTE_DEVICE_NONE 0 +#define USER_COMPUTE_DEVICE_OPENCL 1 +#define USER_COMPUTE_DEVICE_CUDA 2 #ifdef __cplusplus } |