blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 752 Projects 19 Wiki Activity

Fix for MSVC 2008 compiler errors.

This commit is contained in:
Tamito Kajiyama 2014-02-25 01:16:52 +09:00
parent 7ef1ed15f1
commit 036d35dd24
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extern/carve/include/carve/mesh_simplify.hpp vendored
View File

@ -1470,7 +1470,7 @@ namespace carve {
heapval_t last;
std::vector<heapval_t> heap;
point_enumerator_t(vector_t _origin, int _base, int _n_dp) : origin(_origin), rounding_fac(pow(_base, _n_dp)), last(-1.0, _origin), heap() {
point_enumerator_t(vector_t _origin, int _base, int _n_dp) : origin(_origin), rounding_fac(pow((double)_base, _n_dp)), last(-1.0, _origin), heap() {
for (size_t i = 0; i < (1 << 3); ++i) {
vector_t t = origin;
for (size_t j = 0; j < 3; ++j) {
@ -1527,7 +1527,7 @@ namespace carve {
}
aabb_t getAABB() const {
std::set<face_t *>::iterator i = faces.begin();
std::set<face_t *>::const_iterator i = faces.begin();
aabb_t aabb = (*i)->getAABB();
while (++i != faces.end()) {
aabb.unionAABB((*i)->getAABB());