forked from bartvdbraak/blender
Woo Hoo. First git commit.
Changes for VC2013 Now, I can build Blender with VC2013 with Cycles, Collada, OpenExr,OpenImageIO disabled. Also, you need VC2008 sp1 installed to make old libs compatible.
This commit is contained in:
parent
cd4fd50562
commit
e2429d6492
2
extern/libmv/libmv/numeric/numeric.h
vendored
2
extern/libmv/libmv/numeric/numeric.h
vendored
@ -44,9 +44,11 @@
|
|||||||
inline long lround(double d) {
|
inline long lround(double d) {
|
||||||
return (long)(d>0 ? d+0.5 : ceil(d-0.5));
|
return (long)(d>0 ? d+0.5 : ceil(d-0.5));
|
||||||
}
|
}
|
||||||
|
#if _MSC_VER < 1800
|
||||||
inline int round(double d) {
|
inline int round(double d) {
|
||||||
return (d>0) ? int(d+0.5) : int(d-0.5);
|
return (d>0) ? int(d+0.5) : int(d-0.5);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
typedef unsigned int uint;
|
typedef unsigned int uint;
|
||||||
#endif // _WIN32
|
#endif // _WIN32
|
||||||
|
|
||||||
|
1
extern/libmv/third_party/glog/src/logging.cc
vendored
1
extern/libmv/third_party/glog/src/logging.cc
vendored
@ -34,6 +34,7 @@
|
|||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <algorithm>
|
||||||
#ifdef HAVE_UNISTD_H
|
#ifdef HAVE_UNISTD_H
|
||||||
# include <unistd.h> // For _exit.
|
# include <unistd.h> // For _exit.
|
||||||
#endif
|
#endif
|
||||||
|
@ -36,6 +36,7 @@
|
|||||||
|
|
||||||
/* MSVC does not have lrint */
|
/* MSVC does not have lrint */
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
|
#if _MSC_VER < 1800
|
||||||
#ifdef _M_X64
|
#ifdef _M_X64
|
||||||
#include <emmintrin.h>
|
#include <emmintrin.h>
|
||||||
static inline int lrint(double d)
|
static inline int lrint(double d)
|
||||||
@ -56,6 +57,7 @@ static inline int lrint(double d)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
// UNUSED
|
// UNUSED
|
||||||
// #define CC m_channels + channel
|
// #define CC m_channels + channel
|
||||||
|
@ -164,7 +164,7 @@ int ntlBlenderDumper::renderScene( void )
|
|||||||
boutfilename << ".bobj.gz";
|
boutfilename << ".bobj.gz";
|
||||||
gzf = gzopen(boutfilename.str().c_str(), "wb1"); // wb9 is slow for large meshes!
|
gzf = gzopen(boutfilename.str().c_str(), "wb1"); // wb9 is slow for large meshes!
|
||||||
if (!gzf) {
|
if (!gzf) {
|
||||||
errMsg("ntlBlenderDumper::renderScene","Unable to open output '"<<boutfilename<<"' ");
|
errMsg("ntlBlenderDumper::renderScene","Unable to open output '" + boutfilename.str() + "' ");
|
||||||
return 1; }
|
return 1; }
|
||||||
|
|
||||||
// dont transform velocity output, this is handled in blender
|
// dont transform velocity output, this is handled in blender
|
||||||
|
@ -233,7 +233,7 @@ void ParticleTracer::checkDumpTextPositions(double simtime) {
|
|||||||
if(mDumpTextFile.length()>1) {
|
if(mDumpTextFile.length()>1) {
|
||||||
boutfilename << mDumpTextFile << ".cpart2";
|
boutfilename << mDumpTextFile << ".cpart2";
|
||||||
} else {
|
} else {
|
||||||
boutfilename << boutfilename <<"_particles" << ".cpart2";
|
boutfilename << "_particles" << ".cpart2";
|
||||||
}
|
}
|
||||||
debMsgStd("ParticleTracer::checkDumpTextPositions",DM_MSG,"T-Dumping: "<< this->getName() <<", particles:"<<mParts.size()<<" "<< " to "<<boutfilename.str()<<" " , 7);
|
debMsgStd("ParticleTracer::checkDumpTextPositions",DM_MSG,"T-Dumping: "<< this->getName() <<", particles:"<<mParts.size()<<" "<< " to "<<boutfilename.str()<<" " , 7);
|
||||||
|
|
||||||
|
@ -144,9 +144,13 @@ static const int NAN_INT = 0x7FC00000;
|
|||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
# ifndef FREE_WINDOWS
|
# ifndef FREE_WINDOWS
|
||||||
# define isnan(n) _isnan(n)
|
# ifndef isnan
|
||||||
|
# define isnan(n) _isnan(n)
|
||||||
|
# endif
|
||||||
# define finite _finite
|
# define finite _finite
|
||||||
# define hypot _hypot
|
# ifndef hypot
|
||||||
|
# define hypot(a, b) _hypot(a, b)
|
||||||
|
# endif
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -32,6 +32,7 @@
|
|||||||
#include "COM_ExecutionSystem.h"
|
#include "COM_ExecutionSystem.h"
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
|
@ -29,6 +29,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <algorithm>
|
||||||
#include "../system/FreestyleConfig.h"
|
#include "../system/FreestyleConfig.h"
|
||||||
#include "../system/Precision.h"
|
#include "../system/Precision.h"
|
||||||
|
|
||||||
|
@ -29,6 +29,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
#include "BLI_utildefines.h"
|
#include "BLI_utildefines.h"
|
||||||
|
|
||||||
|
@ -30,6 +30,7 @@
|
|||||||
|
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <algorithm>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
@ -29,6 +29,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
|
#include <algorithm>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
#include "OccluderSource.h"
|
#include "OccluderSource.h"
|
||||||
|
@ -36,6 +36,7 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
#include <openexr_api.h>
|
#include <openexr_api.h>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user