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/makesrna/intern/rna_scene.c | |
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/makesrna/intern/rna_scene.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 7ea719c7eb3..37e279f1436 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -681,12 +681,6 @@ static char *rna_RenderSettings_path(PointerRNA *UNUSED(ptr)) return BLI_sprintfN("render"); } -static int rna_omp_threads_get(PointerRNA *ptr) -{ - Scene *scene = (Scene *)ptr->data; - return BKE_scene_num_omp_threads(scene); -} - static int rna_RenderSettings_threads_get(PointerRNA *ptr) { RenderData *rd = (RenderData *)ptr->data; @@ -5096,12 +5090,6 @@ void RNA_def_scene(BlenderRNA *brna) {0, NULL, 0, NULL, NULL} }; - static EnumPropertyItem omp_threads_mode_items[] = { - {SCE_OMP_AUTO, "AUTO", 0, "Auto-detect", "Automatically determine the number of threads"}, - {SCE_OMP_FIXED, "FIXED", 0, "Fixed", "Manually determine the number of threads"}, - {0, NULL, 0, NULL, NULL} - }; - /* Struct definition */ srna = RNA_def_struct(brna, "Scene", "ID"); RNA_def_struct_ui_text(srna, "Scene", @@ -5472,16 +5460,6 @@ void RNA_def_scene(BlenderRNA *brna) RNA_def_property_struct_type(prop, "ColorManagedSequencerColorspaceSettings"); RNA_def_property_ui_text(prop, "Sequencer Color Space Settings", "Settings of color space sequencer is working in"); - prop = RNA_def_property(srna, "omp_threads", PROP_INT, PROP_NONE); - RNA_def_property_range(prop, 1, BLENDER_MAX_THREADS); - RNA_def_property_int_funcs(prop, "rna_omp_threads_get", NULL, NULL); - RNA_def_property_ui_text(prop, "OpenMP Threads", - "Number of CPU threads to use for openmp"); - - prop = RNA_def_property(srna, "omp_threads_mode", PROP_ENUM, PROP_NONE); - RNA_def_property_enum_items(prop, omp_threads_mode_items); - RNA_def_property_ui_text(prop, "OpenMP Mode", "Determine the amount of openmp threads used"); - /* Nestled Data */ /* *** Non-Animated *** */ RNA_define_animate_sdna(false); |