Merge branch 'master' into blender2.8
This commit is contained in:
commit
9a301978bd
|
@ -77,12 +77,12 @@ void BLI_linklist_lockfree_insert(LockfreeLinkList *list,
|
|||
do {
|
||||
tail_node = list->tail;
|
||||
keep_working =
|
||||
(atomic_cas_ptr((void**)&tail_node->next, NULL, node) != NULL);
|
||||
(atomic_cas_ptr((void **)&tail_node->next, NULL, node) != NULL);
|
||||
if (keep_working) {
|
||||
atomic_cas_ptr((void**)&list->tail, tail_node, tail_node->next);
|
||||
atomic_cas_ptr((void **)&list->tail, tail_node, tail_node->next);
|
||||
}
|
||||
} while (keep_working);
|
||||
atomic_cas_ptr((void**)&list->tail, tail_node, node);
|
||||
atomic_cas_ptr((void **)&list->tail, tail_node, node);
|
||||
}
|
||||
|
||||
LockfreeLinkNode *BLI_linklist_lockfree_begin(LockfreeLinkList *list)
|
||||
|
|
|
@ -7752,7 +7752,7 @@ static void direct_link_moviePlaneTracks(FileData *fd, ListBase *plane_tracks_ba
|
|||
int i;
|
||||
|
||||
plane_track->point_tracks = newdataadr(fd, plane_track->point_tracks);
|
||||
test_pointer_array(fd, (void**)&plane_track->point_tracks);
|
||||
test_pointer_array(fd, (void **)&plane_track->point_tracks);
|
||||
for (i = 0; i < plane_track->point_tracksnr; i++) {
|
||||
plane_track->point_tracks[i] = newdataadr(fd, plane_track->point_tracks[i]);
|
||||
}
|
||||
|
|
|
@ -2063,6 +2063,9 @@ void TEXT_OT_delete(wmOperatorType *ot)
|
|||
ot->exec = text_delete_exec;
|
||||
ot->poll = text_edit_poll;
|
||||
|
||||
/* flags */
|
||||
ot->flag = OPTYPE_UNDO;
|
||||
|
||||
/* properties */
|
||||
RNA_def_enum(ot->srna, "type", delete_type_items, DEL_NEXT_CHAR, "Type", "Which part of the text to delete");
|
||||
}
|
||||
|
|
|
@ -1734,7 +1734,7 @@ void GPU_pbvh_bmesh_buffers_update(
|
|||
int i;
|
||||
|
||||
#if 0
|
||||
BM_iter_as_array(bm, BM_VERTS_OF_FACE, f, (void**)v, 3);
|
||||
BM_iter_as_array(bm, BM_VERTS_OF_FACE, f, (void **)v, 3);
|
||||
#endif
|
||||
BM_face_as_array_vert_tri(f, v);
|
||||
|
||||
|
|
Loading…
Reference in New Issue