Merge branch 'master' into unstable

This commit is contained in:
Aloshi 2013-08-23 11:28:45 -05:00
commit f2689f49a6

View file

@ -125,8 +125,7 @@ void TextListComponent<T>::render(const Eigen::Affine3f& parentTrans)
int startEntry = 0; int startEntry = 0;
//number of entries that can fit on the screen simultaniously //number of entries that can fit on the screen simultaniously
int screenCount = (Renderer::getScreenHeight() - cutoff) / entrySize; int screenCount = (int)mSize.y() / entrySize;
screenCount -= 1;
if((int)mRowVector.size() >= screenCount) if((int)mRowVector.size() >= screenCount)
{ {