diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-04-27 20:38:53 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-04-27 20:39:03 +0400 |
| commit | f3798fa45e3b4936679948f9c9f51103dfe7a9d4 (patch) | |
| tree | 48d270af79684a5d6c6a2d08359c3e724786ea10 /source/blender/makesdna/DNA_scene_types.h | |
| parent | 4aea8f10855e9de162ca3ea0c232d2590ec386ba (diff) | |
Revert the testing sculpt openmp thread control and limit for OSX to physical threads as in 2.70a tag
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 2e6ef7af6ff..5a47e76b4f9 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1174,12 +1174,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 */ @@ -1783,10 +1779,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 |