diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-04-01 01:30:24 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-04-01 01:30:24 +0400 |
commit | d25ba1eccdc7043c8f470991683dbc3cef93156e (patch) | |
tree | df831e4e8262879ccb986248fddef6bf275bde1b /source/blender/makesdna | |
parent | 42fca2f145b81d8b359164f17341bfc111360f22 (diff) |
Changes to openmp threads commit (UI and RNA)
- use same names as render threads
- remove OpenMP from UI
- remove details from tips
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index d135ae6a962..0c950ff9ff0 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1165,8 +1165,13 @@ typedef struct Scene { short flag; /* various settings */ - short use_nodes; - + char use_nodes; + + /* Openmp Global Settings */ + char omp_threads_mode; + short omp_threads; + char pad[6]; + struct bNodeTree *nodetree; struct Editing *ed; /* sequence editor data is allocated here */ @@ -1224,13 +1229,8 @@ typedef struct Scene { /* RigidBody simulation world+settings */ struct RigidBodyWorld *rigidbody_world; - - /* Openmp Global Settings */ - int omp_num_threads; - int omp_mode; } Scene; - /* **************** RENDERDATA ********************* */ /* flag */ @@ -1775,7 +1775,7 @@ typedef enum SculptFlags { /* OpenMP settings */ #define SCE_OMP_AUTO 0 -#define SCE_OMP_MANUAL 1 +#define SCE_OMP_FIXED 1 #ifdef __cplusplus } |