Commit: 9dcc33794c9cb87d08d406498d04e6c770105b2a
Author: Sebastián Barschkis
Date: Mon Sep 7 00:38:39 2015 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB9dcc33794c9cb87d08d406498d04e6c770105b2a
minor tweaks
===================================================================
M intern/smoke/intern/FLUID_3D.cpp
M intern/smoke/intern/MANTA.cpp
M source/blender/python/manta_pp/CMakeLists.txt
M source/blender/python/manta_pp/plugin/fire.cpp
===================================================================
diff --git a/intern/smoke/intern/FLUID_3D.cpp b/intern/smoke/intern/FLUID_3D.cpp
index b0332c8..a33e6cd 100644
--- a/intern/smoke/intern/FLUID_3D.cpp
+++ b/intern/smoke/intern/FLUID_3D.cpp
@@ -784,7 +784,6 @@ void FLUID_3D::step(float dt, float gravity[3])
void FLUID_3D::processBurn(float *fuel, float *smoke, float *react, float
*heat,
float *r, float *g, float
*b, int total_cells, float dt)
{
-
PyGILState_STATE gilstate = PyGILState_Ensure();
PyRun_SimpleString(fire_process_burn.c_str());
PyGILState_Release(gilstate);
diff --git a/intern/smoke/intern/MANTA.cpp b/intern/smoke/intern/MANTA.cpp
index 828bda5..e2cffbf 100644
--- a/intern/smoke/intern/MANTA.cpp
+++ b/intern/smoke/intern/MANTA.cpp
@@ -620,7 +620,7 @@ void Manta_API::updatePointers(FLUID_3D *fluid, bool
updateColor)
float* manta_fluid_density = (float*
)pointerFromString(getGridPointer("density", "s"));
int* manta_fluid_flags = (int*
)pointerFromString(getGridPointer("flags", "s"));
if (fluid->_density != NULL){
- for (int cnt(0); cnt < fluid->xRes() * fluid->yRes() *
fluid->zRes(); ++cnt){
+ for (int cnt(0); cnt < fluid->xRes() * fluid->yRes() *
fluid->zRes(); ++cnt) {
fluid->_density[cnt] = 0.;
fluid->_manta_flags[cnt] = 2;
}
@@ -646,7 +646,7 @@ void Manta_API::updatePointers(FLUID_3D *fluid, bool
updateColor)
fluid->_manta_inflow = (float*
)pointerFromString(getGridPointer("inflow_grid", "s"));
if (fluid-> manta_resoution == 2){return;}
- if (fluid->using_colors){
+ if (fluid->using_colors) {
cout<< "POINTER FOR R_LOW" << fluid->_color_r<< endl;
fluid->_color_r = (float*
)pointerFromString(getGridPointer("color_r_low", "s"));
cout<< "POINTER FOR R_LOW" << fluid->_color_r<< endl;
diff --git a/source/blender/python/manta_pp/CMakeLists.txt
b/source/blender/python/manta_pp/CMakeLists.txt
index b91314c..b2b1926 100644
--- a/source/blender/python/manta_pp/CMakeLists.txt
+++ b/source/blender/python/manta_pp/CMakeLists.txt
@@ -75,6 +75,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/particle.h.reg
${CMAKE_CURRENT_SOURCE_DIR}/particle.h.reg.cpp
${CMAKE_CURRENT_SOURCE_DIR}/plugin/advection.cpp
${CMAKE_CURRENT_SOURCE_DIR}/plugin/extforces.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/plugin/fire.cpp
${CMAKE_CURRENT_SOURCE_DIR}/plugin/flip.cpp
${CMAKE_CURRENT_SOURCE_DIR}/plugin/initplugins.cpp
${CMAKE_CURRENT_SOURCE_DIR}/plugin/kepsilon.cpp
diff --git a/source/blender/python/manta_pp/plugin/fire.cpp
b/source/blender/python/manta_pp/plugin/fire.cpp
index 1d2c75a..793eebc 100644
--- a/source/blender/python/manta_pp/plugin/fire.cpp
+++ b/source/blender/python/manta_pp/plugin/fire.cpp
@@ -9,6 +9,7 @@
+
/******************************************************************************
*
* MantaFlow fluid solver framework
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
