[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26374] trunk/blender/source/blender: - change max threads from 8 to 64, need to keep an eye on stack memory use here.
Campbell Barton
ideasman42 at gmail.com
Thu Jan 28 20:18:35 CET 2010
Revision: 26374
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26374
Author: campbellbarton
Date: 2010-01-28 20:18:35 +0100 (Thu, 28 Jan 2010)
Log Message:
-----------
- change max threads from 8 to 64, need to keep an eye on stack memory use here.
- reload fix didnt work last commit.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenlib/BLI_threads.h
trunk/blender/source/blender/blenlib/intern/threads.c
trunk/blender/source/blender/editors/render/render_shading.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2010-01-28 18:20:28 UTC (rev 26373)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2010-01-28 19:18:35 UTC (rev 26374)
@@ -3758,7 +3758,7 @@
BLI_uniquename(seqbasep, seq, "Sequence", '.', offsetof(Sequence, name), SEQ_NAME_MAXSTR);
}
-/* NOTE: this function doesn't fill in iamge names */
+/* NOTE: this function doesn't fill in image names */
Sequence *sequencer_add_image_strip(bContext *C, ListBase *seqbasep, SeqLoadInfo *seq_load)
{
Scene *scene= CTX_data_scene(C); /* only for active seq */
Modified: trunk/blender/source/blender/blenlib/BLI_threads.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_threads.h 2010-01-28 18:20:28 UTC (rev 26373)
+++ trunk/blender/source/blender/blenlib/BLI_threads.h 2010-01-28 19:18:35 UTC (rev 26374)
@@ -34,7 +34,7 @@
#include <pthread.h>
/* for tables, button in UI, etc */
-#define BLENDER_MAX_THREADS 8
+#define BLENDER_MAX_THREADS 64
struct ListBase;
Modified: trunk/blender/source/blender/blenlib/intern/threads.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/threads.c 2010-01-28 18:20:28 UTC (rev 26373)
+++ trunk/blender/source/blender/blenlib/intern/threads.c 2010-01-28 19:18:35 UTC (rev 26374)
@@ -107,7 +107,7 @@
static int thread_levels= 0; /* threads can be invoked inside threads */
/* just a max for security reasons */
-#define RE_MAX_THREAD 8
+#define RE_MAX_THREAD BLENDER_MAX_THREADS
typedef struct ThreadSlot {
struct ThreadSlot *next, *prev;
Modified: trunk/blender/source/blender/editors/render/render_shading.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_shading.c 2010-01-28 18:20:28 UTC (rev 26373)
+++ trunk/blender/source/blender/editors/render/render_shading.c 2010-01-28 19:18:35 UTC (rev 26374)
@@ -767,7 +767,7 @@
Material *ma= CTX_data_pointer_get_type(C, "material", &RNA_Material).data;
if(ma==NULL)
- return;
+ return OPERATOR_CANCELLED;
copy_matcopybuf(ma);
Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c 2010-01-28 18:20:28 UTC (rev 26373)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c 2010-01-28 19:18:35 UTC (rev 26374)
@@ -2143,7 +2143,7 @@
prop= RNA_def_property(srna, "threads", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "threads");
- RNA_def_property_range(prop, 1, 8);
+ RNA_def_property_range(prop, 1, BLENDER_MAX_THREADS);
RNA_def_property_int_funcs(prop, "rna_SceneRenderData_threads_get", NULL, NULL);
RNA_def_property_ui_text(prop, "Threads", "Number of CPU threads to use simultaneously while rendering (for multi-core/CPU systems)");
RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
More information about the Bf-blender-cvs
mailing list