diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-21 15:37:42 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-21 15:37:42 +0400 |
commit | c4ee1f265847db4fed34df05a32f4b0fa3612092 (patch) | |
tree | 75792db986f09f492eaa4576d12e90d0dc669ddd /source/blender/makesrna/intern/rna_fluidsim.c | |
parent | b11dc51974d48738b4e53c9c81971a045d73c5a6 (diff) |
Fluid simulation manual number of threads option now doesn't set the number
of threads to the number of cores when the fluid is created. Rather it is now
set to 0 which means "use the number of threads specified for the scene".
Diffstat (limited to 'source/blender/makesrna/intern/rna_fluidsim.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_fluidsim.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_fluidsim.c b/source/blender/makesrna/intern/rna_fluidsim.c index 923e52e29c0..b18c21d53f1 100644 --- a/source/blender/makesrna/intern/rna_fluidsim.c +++ b/source/blender/makesrna/intern/rna_fluidsim.c @@ -28,6 +28,7 @@ #include "DNA_object_fluidsim.h" +#include "BLI_threads.h" #include "BLI_utildefines.h" #include "BLI_path_util.h" @@ -284,8 +285,8 @@ static void rna_def_fluidsim_domain(BlenderRNA *brna) prop = RNA_def_property(srna, "threads", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "threads"); - RNA_def_property_range(prop, 1, 32); - RNA_def_property_ui_text(prop, "Simulation Threads", "Threads used to calculate the simulation"); + RNA_def_property_range(prop, 0, BLENDER_MAX_THREADS); + RNA_def_property_ui_text(prop, "Simulation Threads", "Override number of threads for the simulation, 0 is automatic"); prop = RNA_def_property(srna, "resolution", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "resolutionxyz"); |