Skip to content

Commit

Permalink
Merge branch 'main' into render-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
malomo committed Nov 20, 2024
2 parents e1c5948 + a240423 commit 327d90a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion tests/core/000-static-asserts/meshes/components/color.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ void colorComponentStaticAsserts()
static_assert(
comp::HasOptionalColor<TriMeshVertex&&>,
"TriMesh Vertex&& does not satisfy the HasOptionalColor concept");

}

#endif // COMP_COLOR_H
2 changes: 1 addition & 1 deletion vclib/render/include/vclib/render_bgfx/context.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class Context
FontManager* mFontManager = nullptr;
ProgramManager* mProgramManager = nullptr;

inline static bool sInitialized = false;
inline static bool sInitialized = false;
inline static bgfx::RendererType::Enum sRenderType =
bgfx::RendererType::Count;

Expand Down

0 comments on commit 327d90a

Please sign in to comment.