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/blenkernel/intern/scene.c | |
| 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/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 02bc1fcb699..e501010fc56 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -638,8 +638,8 @@ Scene *BKE_scene_add(Main *bmain, const char *name) sce->gm.exitkey = 218; // Blender key code for ESC - sce->omp_mode = SCE_OMP_AUTO; - sce->omp_num_threads = 1; + sce->omp_threads_mode = SCE_OMP_AUTO; + sce->omp_threads = 1; sound_create_scene(sce); @@ -1873,8 +1873,8 @@ int BKE_scene_num_threads(const Scene *scene) int BKE_scene_num_omp_threads(const struct Scene *scene) { - if (scene->omp_mode == SCE_OMP_AUTO) + if (scene->omp_threads_mode == SCE_OMP_AUTO) return BLI_omp_thread_count(); else - return scene->omp_num_threads; + return scene->omp_threads; } |