diff --git a/CMCore b/CMCore index 53449b1d..2ba30036 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 53449b1d4c579efd6f8bd2de6b315cc0663a1ecd +Subproject commit 2ba3003685b788a5484fdf103249b81008384cb4 diff --git a/src/SceneGraph/font/FontSourceMulti.cpp b/src/SceneGraph/font/FontSourceMulti.cpp index 9c052d1a..befda075 100644 --- a/src/SceneGraph/font/FontSourceMulti.cpp +++ b/src/SceneGraph/font/FontSourceMulti.cpp @@ -27,8 +27,7 @@ namespace hgl ||!fs ||fs==default_source)return; - if(fs->GetCharHeight()>max_char_height) - max_char_height=fs->GetCharHeight(); + get_max(max_char_height,fs->GetCharHeight()); source_map.Update(ub,fs); } @@ -43,8 +42,7 @@ namespace hgl for(int i=0;iright->GetCharHeight()>max_char_height) - max_char_height=(*fsp)->right->GetCharHeight(); + get_max(max_char_height,(*fsp)->right->GetCharHeight()); ++fsp; }