diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2014-04-29 20:52:52 +0400 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2014-04-29 20:52:52 +0400 |
| commit | 55e9632a564782fc0b27ad5def94cc7ae5f056c3 (patch) | |
| tree | c6d1d06cd92a905e6f473fba396602485c35f1b1 /source/blender/makesdna/DNA_scene_types.h | |
| parent | 67ae1f7d000031fd7b8feea54d48c3cf5ba440fb (diff) | |
| parent | 1ef06abc5e18cd4888444ee19f103c1a89467f01 (diff) | |
Merge remote-tracking branch 'upstream/master' into bake-cycles
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 0db3ac5b882..ceb938c3af2 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1215,12 +1215,8 @@ typedef struct Scene { short flag; /* various settings */ char use_nodes; - - /* Openmp Global Settings */ - char omp_threads_mode; - short omp_threads; - char pad[6]; - + char pad[1]; + struct bNodeTree *nodetree; struct Editing *ed; /* sequence editor data is allocated here */ @@ -1826,10 +1822,6 @@ typedef enum SculptFlags { #define USER_UNIT_OPT_SPLIT 1 #define USER_UNIT_ROT_RADIANS 2 -/* OpenMP settings */ -#define SCE_OMP_AUTO 0 -#define SCE_OMP_FIXED 1 - #ifdef __cplusplus } #endif |