diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2016-12-01 12:29:46 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2016-12-01 12:29:46 +0300 |
| commit | ff2a74906a7b70625a4e941c6a805f7734491204 (patch) | |
| tree | 562f5ccdd9f4e377d20fe22eadca48201924b4b3 /source/blender/makesdna/DNA_userdef_types.h | |
| parent | 73c1c92c0e86ce1b5a8abeaa16be2bf2c259412b (diff) | |
| parent | 58877d6d082d82185ca611b704364168e5984bd7 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_userdef_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 30d81df07ef..1c4db5289ef 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -866,14 +866,6 @@ typedef enum eNdof_Flag { #define NDOF_PIXELS_PER_SECOND 600.0f -/* compute_device_type */ -typedef enum eCompute_Device_Type { - USER_COMPUTE_DEVICE_NONE = 0, - USER_COMPUTE_DEVICE_OPENCL = 1, - USER_COMPUTE_DEVICE_CUDA = 2, -} eCompute_Device_Type; - - typedef enum eMultiSample_Type { USER_MULTISAMPLE_NONE = 0, USER_MULTISAMPLE_2 = 2, |