blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Depsgraph: Fix crash using --debug-depsgraph and --debug-depsgraph-no-threads 

Was accessing past the array boundaries.

Should be safe for 2.79a.
This commit is contained in:
Sergey Sharybin 2018-02-21 10:42:22 +01:00
parent 09aaee5640
commit 9e707802c2
Notes: blender-bot 2023-02-14 11:21:40 +01:00 
Referenced by issue #53683, 2.79a release
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/intern/scene.c
View File

@ -1456,6 +1456,8 @@ typedef struct ThreadedObjectUpdateState {
bool has_mballs;
#endif
int num_threads;
/* Execution statistics */
bool has_updated_objects;
ListBase *statistics;
@ -1555,7 +1557,6 @@ static void scene_update_object_add_task(void *node, void *user_data)
static void print_threads_statistics(ThreadedObjectUpdateState *state)
{
int i, tot_thread;
double finish_time;
if ((G.debug & G_DEBUG_DEPSGRAPH) == 0) {
@ -1583,10 +1584,9 @@ static void print_threads_statistics(ThreadedObjectUpdateState *state)
}
#else
finish_time = PIL_check_seconds_timer();
tot_thread = BLI_system_thread_count();
int total_objects = 0;
for (i = 0; i < tot_thread; i++) {
for (int i = 0; i < state->num_threads; i++) {
int thread_total_objects = 0;
double thread_total_time = 0.0;
StatisicsEntry *entry;
@ -1683,6 +1683,7 @@ static void scene_update_objects(EvaluationContext *eval_ctx, Main *bmain, Scene
"scene update objects stats");
state.has_updated_objects = false;
state.base_time = PIL_check_seconds_timer();
state.num_threads = tot_thread;
}
#ifdef MBALL_SINGLETHREAD_HACK