diff options
-rw-r--r-- | source/blender/blenlib/intern/BLI_linklist_lockfree.c | 6 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_text/text_ops.c | 3 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_buffers.c | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/blenlib/intern/BLI_linklist_lockfree.c b/source/blender/blenlib/intern/BLI_linklist_lockfree.c index c004ddb6b66..ef93ce3619f 100644 --- a/source/blender/blenlib/intern/BLI_linklist_lockfree.c +++ b/source/blender/blenlib/intern/BLI_linklist_lockfree.c @@ -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) diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index fdd65add6d1..4ec4f43fb1e 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -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]); } diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index 4f332c09ce2..2ce699aa6e2 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -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"); } diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c index 3367a568bc5..d2a18684e27 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -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); |