sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: comments/style

Browse Source
This commit is contained in:
Campbell Barton 2015-11-06 05:09:14 +11:00
parent 1adc196723
commit 7a09d15ade
11 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenlib/intern/task.c
View File

@ -140,10 +140,10 @@ static bool task_scheduler_thread_wait_pop(TaskScheduler *scheduler, Task **task
/* Assuming we can only have a void queue in 'exit' case here seems logical (we should only be here after
* our worker thread has been woken up from a condition_wait(), which only happens after a new task was
* added to the queue), but it is wrong.
* Waiting on condition may wake up the thread even if condition is not signaled (spurious wakeups), and some
* Waiting on condition may wake up the thread even if condition is not signaled (spurious wake-ups), and some
* race condition may also empty the queue **after** condition has been signaled, but **before** awoken thread
* reaches this point...
* See http://stackoverflow.com/questions/8594591/why-does-pthread-cond-wait-have-spurious-wakeups
* See http://stackoverflow.com/questions/8594591
*
* So we only abort here if do_exit is set.
*/
@ -399,7 +399,7 @@ TaskPool *BLI_task_pool_create(TaskScheduler *scheduler, void *userdata)
* \a BLI_task_pool_work_and_wait() on it to be sure it will be processed).
*
* \note Background pools are non-recursive (that is, you should not create other background pools in tasks assigned
* to a brackground pool, they could end never being executed, since the 'fallback' background thread is already
* to a background pool, they could end never being executed, since the 'fallback' background thread is already
* busy with parent task in single-threaded context).
*/
TaskPool *BLI_task_pool_create_background(TaskScheduler *scheduler, void *userdata)

1
source/blender/bmesh/intern/bmesh_polygon.c
View File

@ -921,7 +921,6 @@ void BM_face_triangulate(
/* loop over calculated triangles and create new geometry */
for (i = 0; i < totfilltri; i++) {
/* the order is reverse, otherwise the normal is flipped */
BMLoop *l_tri[3] = {
loops[tris[i][0]],
loops[tris[i][1]],

3
source/blender/editors/space_sequencer/sequencer_edit.c
View File

@ -3858,8 +3858,7 @@ static int sequencer_export_subtitles_invoke(bContext *C, wmOperator *op, const
static int sequencer_export_subtitles_exec(bContext *C, wmOperator *op)
{
Scene *scene = CTX_data_scene(C);
Sequence *seq = BKE_sequencer_active_get(scene);
Sequence *seq_next;
Sequence *seq, *seq_next;
Editing *ed = BKE_sequencer_editing_get(scene, false);
ListBase text_seq = {0};
int iter = 0;

2
source/blender/editors/transform/transform.c
View File

@ -5574,7 +5574,7 @@ static void slide_origdata_interp_data_vert(
float (*faces_center)[3] = BLI_array_alloca(faces_center, l_num);
BMLoop *l;
BM_ITER_ELEM_INDEX (l, &liter, sv->v, BM_LOOPS_OF_VERT, j) {;
BM_ITER_ELEM_INDEX (l, &liter, sv->v, BM_LOOPS_OF_VERT, j) {
BM_face_calc_center_mean(l->f, faces_center[j]);
}