diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2016-11-22 06:12:44 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2016-11-22 06:12:44 +0300 |
| commit | 51e9b190c8f8c4bce54006c45461737e790bbb97 (patch) | |
| tree | a9828e17070bc741de2c625c6575b5ceaf86b79c /source/blender/makesdna | |
| parent | 358191c9d70b09c0acdb3a9823eca1257ad7d2e7 (diff) | |
| parent | bd8cbf5c079b4cffb3652195ba8a9c92d8a60d15 (diff) | |
Merge remote-tracking branch 'origin/master' into soc-2016-cycles_denoising
Conflicts:
intern/cycles/blender/blender_session.cpp
Diffstat (limited to 'source/blender/makesdna')
| -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 e018b66dd60..0ad4482708f 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -867,14 +867,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, |