diff --git a/source/blender/blenkernel/BKE_grease_pencil.hh b/source/blender/blenkernel/BKE_grease_pencil.hh index 7271f2d2fc4..34040e0ea1e 100644 --- a/source/blender/blenkernel/BKE_grease_pencil.hh +++ b/source/blender/blenkernel/BKE_grease_pencil.hh @@ -298,15 +298,17 @@ class Layer : public ::GreasePencilLayer { private: using SortedKeysIterator = const int *; + private: GreasePencilFrame *add_frame_internal(int frame_number, int drawing_index); int frame_index_at(int frame_number) const; /** - * Removes null frames starting from \a begin until \a end (excluded) or until a non-null frame is reached. - * \param begin, end: Iterators into the `sorted_keys` span. - * \returns an iterator to the element after the last null-frame that was removed. + * Removes null frames starting from \a begin until \a end (excluded) or until a non-null frame + * is reached. \param begin, end: Iterators into the `sorted_keys` span. \returns an iterator to + * the element after the last null-frame that was removed. */ - SortedKeysIterator remove_leading_null_frames_in_range(SortedKeysIterator begin, SortedKeysIterator end); + SortedKeysIterator remove_leading_null_frames_in_range(SortedKeysIterator begin, + SortedKeysIterator end); }; class LayerGroupRuntime { diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_frames.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_frames.cc index ddb98c5df99..0d318cab415 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_frames.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_frames.cc @@ -71,7 +71,7 @@ bool layer_has_any_frame_selected(const bke::greasepencil::Layer *layer) return false; } -void select_frames_region( KeyframeEditData *ked, +void select_frames_region(KeyframeEditData *ked, bke::greasepencil::Layer *layer, const short tool, const short select_mode) diff --git a/source/creator/creator.c b/source/creator/creator.c index 251e79425c0..574aeef30e3 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -15,7 +15,7 @@ #endif #ifdef __linux__ -#include +# include #endif #if defined(WITH_TBB_MALLOC) && defined(_MSC_VER) && defined(NDEBUG) @@ -337,9 +337,9 @@ int main(int argc, /* Here we check for Windows ARM64 or WSL, and override the Mesa reported OpenGL version */ #if defined(WIN32) || defined(__linux__) # if defined(WIN32) - if(strncmp(BLI_getenv("PROCESSOR_IDENTIFIER"), "ARM", 3) == 0) + if (strncmp(BLI_getenv("PROCESSOR_IDENTIFIER"), "ARM", 3) == 0) # else /* Must be linux, so check if we're in WSL */ - if(access("/proc/sys/fs/binfmt_misc/WSLInterop", F_OK) == 0) + if (access("/proc/sys/fs/binfmt_misc/WSLInterop", F_OK) == 0) # endif { BLI_setenv_if_new("MESA_GLSL_VERSION_OVERRIDE", "430");