[Bf-blender-cvs] [5d7195ab8ec] master: Cleanup: warnings
Campbell Barton
noreply at git.blender.org
Sat Oct 12 00:47:41 CEST 2019
Commit: 5d7195ab8ec750b7b6502cd2b4cbf076bfa33c8f
Author: Campbell Barton
Date: Sat Oct 12 09:45:20 2019 +1100
Branches: master
https://developer.blender.org/rB5d7195ab8ec750b7b6502cd2b4cbf076bfa33c8f
Cleanup: warnings
===================================================================
M source/blender/blenlib/intern/BLI_temporary_allocator.cc
M source/blender/editors/animation/anim_markers.c
===================================================================
diff --git a/source/blender/blenlib/intern/BLI_temporary_allocator.cc b/source/blender/blenlib/intern/BLI_temporary_allocator.cc
index e41cf36f66d..b145e65530d 100644
--- a/source/blender/blenlib/intern/BLI_temporary_allocator.cc
+++ b/source/blender/blenlib/intern/BLI_temporary_allocator.cc
@@ -73,7 +73,7 @@ struct ThreadLocalBuffers {
}
};
-thread_local ThreadLocalBuffers local_storage;
+static thread_local ThreadLocalBuffers local_storage;
void *BLI_temporary_allocate(uint size)
{
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index 29d06d5b297..36583ecf060 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -1181,7 +1181,7 @@ static int select_timeline_marker_frame(ListBase *markers,
LISTBASE_CIRCULAR_FORWARD_BEGIN (markers, marker, marker_selected) {
/* this way a not-extend select will always give 1 selected marker */
- if ((marker->frame == frame)) {
+ if (marker->frame == frame) {
marker->flag ^= SELECT;
break;
}
More information about the Bf-blender-cvs
mailing list