diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-08-26 14:27:04 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-08-26 14:27:04 +0400 |
| commit | de7f08cc41c7087ecde096c89ee58f43ccb1cf91 (patch) | |
| tree | 401ab2a2a7429c2caa63c3135341958155a86935 /intern/elbeem | |
| parent | a34ffefa0025d144826cd1bf7a136af743847f1b (diff) | |
| parent | d893b0f9ff5fc21277b9c24568e224961537c23c (diff) | |
merge with 2.5 at r22793
Diffstat (limited to 'intern/elbeem')
| -rw-r--r-- | intern/elbeem/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/elbeem/intern/paraloopend.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt index 03fd4a3fefc..8b8a3000efd 100644 --- a/intern/elbeem/CMakeLists.txt +++ b/intern/elbeem/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC ${PNG_INC} ${ZLIB_INC} ${SDL_INC} extern) +SET(INC ${PNG_INC} ${ZLIB_INC} extern) FILE(GLOB SRC intern/*.cpp) diff --git a/intern/elbeem/intern/paraloopend.h b/intern/elbeem/intern/paraloopend.h index 6bb224b625a..a396e395126 100644 --- a/intern/elbeem/intern/paraloopend.h +++ b/intern/elbeem/intern/paraloopend.h @@ -22,9 +22,9 @@ { if(doReduce) { // synchronize global vars - for(int j=0; j<calcListFull.size() ; j++) mListFull.push_back( calcListFull[j] ); - for(int j=0; j<calcListEmpty.size(); j++) mListEmpty.push_back( calcListEmpty[j] ); - for(int j=0; j<calcListParts.size(); j++) mpParticles->addFullParticle( calcListParts[j] ); + for(size_t j=0; j<calcListFull.size() ; j++) mListFull.push_back( calcListFull[j] ); + for(size_t j=0; j<calcListEmpty.size(); j++) mListEmpty.push_back( calcListEmpty[j] ); + for(size_t j=0; j<calcListParts.size(); j++) mpParticles->addFullParticle( calcListParts[j] ); if(calcMaxVlen>mMaxVlen) { mMxvx = calcMxvx; mMxvy = calcMxvy; |