Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandr Kuznetsov <kuzsasha@gmail.com>2013-11-29 23:50:59 +0400
committerAlexandr Kuznetsov <kuzsasha@gmail.com>2013-11-30 00:13:12 +0400
commite2429d6492bb58a87bcbee29a0f78a6ea6bb6dfa (patch)
treec8fd591ec86f46a00464a8500d6a523def190abf /intern/elbeem
parentcd4fd5056269858c6b85a9eec9929fecbe968695 (diff)
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.
Diffstat (limited to 'intern/elbeem')
-rw-r--r--intern/elbeem/intern/ntl_blenderdumper.cpp2
-rw-r--r--intern/elbeem/intern/particletracer.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/elbeem/intern/ntl_blenderdumper.cpp b/intern/elbeem/intern/ntl_blenderdumper.cpp
index 4efff4337a6..ec05c25004d 100644
--- a/intern/elbeem/intern/ntl_blenderdumper.cpp
+++ b/intern/elbeem/intern/ntl_blenderdumper.cpp
@@ -164,7 +164,7 @@ int ntlBlenderDumper::renderScene( void )
boutfilename << ".bobj.gz";
gzf = gzopen(boutfilename.str().c_str(), "wb1"); // wb9 is slow for large meshes!
if (!gzf) {
- errMsg("ntlBlenderDumper::renderScene","Unable to open output '"<<boutfilename<<"' ");
+ errMsg("ntlBlenderDumper::renderScene","Unable to open output '" + boutfilename.str() + "' ");
return 1; }
// dont transform velocity output, this is handled in blender
diff --git a/intern/elbeem/intern/particletracer.cpp b/intern/elbeem/intern/particletracer.cpp
index 593b582d91f..2f1f5f8efbb 100644
--- a/intern/elbeem/intern/particletracer.cpp
+++ b/intern/elbeem/intern/particletracer.cpp
@@ -233,7 +233,7 @@ void ParticleTracer::checkDumpTextPositions(double simtime) {
if(mDumpTextFile.length()>1) {
boutfilename << mDumpTextFile << ".cpart2";
} else {
- boutfilename << boutfilename <<"_particles" << ".cpart2";
+ boutfilename << "_particles" << ".cpart2";
}
debMsgStd("ParticleTracer::checkDumpTextPositions",DM_MSG,"T-Dumping: "<< this->getName() <<", particles:"<<mParts.size()<<" "<< " to "<<boutfilename.str()<<" " , 7);