- change max threads from 8 to 64, need to keep an eye on stack memory use here.
- reload fix didnt work last commit.
This commit is contained in:
@@ -3758,7 +3758,7 @@ void seqUniqueName(ListBase *seqbasep, Sequence *seq)
|
||||
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 */
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -107,7 +107,7 @@ static pthread_mutex_t _custom1_lock = PTHREAD_MUTEX_INITIALIZER;
|
||||
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;
|
||||
|
||||
@@ -767,7 +767,7 @@ static int copy_material_exec(bContext *C, wmOperator *op)
|
||||
Material *ma= CTX_data_pointer_get_type(C, "material", &RNA_Material).data;
|
||||
|
||||
if(ma==NULL)
|
||||
return;
|
||||
return OPERATOR_CANCELLED;
|
||||
|
||||
copy_matcopybuf(ma);
|
||||
|
||||
|
||||
@@ -2143,7 +2143,7 @@ static void rna_def_scene_render_data(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, 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);
|
||||
|
||||
Reference in New Issue
Block a user