Commit: 15aa698211c0be2af81f7938fee96747dfad4346
Author: Sebastián Barschkis
Date: Fri Oct 21 13:37:25 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB15aa698211c0be2af81f7938fee96747dfad4346
no need to rename main() from mantaflow - simply remove file from cmake and no
main() method clash will occur
===================================================================
M intern/mantaflow/CMakeLists.txt
M intern/mantaflow/intern/manta_pp/pwrapper/pymain.cpp
===================================================================
diff --git a/intern/mantaflow/CMakeLists.txt b/intern/mantaflow/CMakeLists.txt
index 4de347a..435b914 100644
--- a/intern/mantaflow/CMakeLists.txt
+++ b/intern/mantaflow/CMakeLists.txt
@@ -132,7 +132,6 @@ set(SRC
intern/manta_pp/pwrapper/pconvert.cpp
intern/manta_pp/pwrapper/pconvert.h
intern/manta_pp/pwrapper/pvec3.cpp
- intern/manta_pp/pwrapper/pymain.cpp
intern/manta_pp/pwrapper/pythonInclude.h
intern/manta_pp/pwrapper/registry.cpp
intern/manta_pp/pwrapper/registry.h
diff --git a/intern/mantaflow/intern/manta_pp/pwrapper/pymain.cpp
b/intern/mantaflow/intern/manta_pp/pwrapper/pymain.cpp
index 1dc11b9..e38155c 100644
--- a/intern/mantaflow/intern/manta_pp/pwrapper/pymain.cpp
+++ b/intern/mantaflow/intern/manta_pp/pwrapper/pymain.cpp
@@ -91,8 +91,7 @@ void runScript(vector<string>& args) {
delete [] cargs;
}
-// Changed function name from 'main()' to 'mainManta()' because of name
conflict
-int mainManta(int argc,char* argv[]) {
+int main(int argc,char* argv[]) {
debMsg("Version: "<< buildInfoString() , 1);
bool doScript = true;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
