[Bf-blender-cvs] [2fcda12] soc-2014-fluid: passing void pointers for different types of grids

Roman Pogribnyi noreply at git.blender.org
Thu Oct 16 22:07:20 CEST 2014


Commit: 2fcda12a14d694369aca52929797a1097c3fa5b6
Author: Roman Pogribnyi
Date:   Thu Oct 16 21:33:35 2014 +0200
Branches: soc-2014-fluid
https://developer.blender.org/rB2fcda12a14d694369aca52929797a1097c3fa5b6

passing void pointers for different types of grids

===================================================================

M	intern/smoke/intern/MANTA.cpp
M	intern/smoke/intern/MANTA.h

===================================================================

diff --git a/intern/smoke/intern/MANTA.cpp b/intern/smoke/intern/MANTA.cpp
index 38d8c5d..16edebe 100644
--- a/intern/smoke/intern/MANTA.cpp
+++ b/intern/smoke/intern/MANTA.cpp
@@ -339,7 +339,7 @@ void Manta_API::stop_manta_sim()
 	pthread_cancel(manta_thread);
 }
 
-void Manta_API::addGrid(float * data, string name, int x, int y, int z)
+void Manta_API::addGrid(void * data, string name, int x, int y, int z)
 {
 	std::ostringstream stringStream;
 	stringStream << "temp_" << name;
@@ -358,7 +358,7 @@ void Manta_API::addGrid(float * data, string name, int x, int y, int z)
 	PyGILState_Release(gilstate);		
 }
 
-void Manta_API::addAdaptiveGrid(float * data, string name, int minX, int minY, int minZ, int maxX, int maxY, int maxZ)
+void Manta_API::addAdaptiveGrid(void * data, string name, int minX, int minY, int minZ, int maxX, int maxY, int maxZ)
 {
 	if (data == NULL)
 	{
diff --git a/intern/smoke/intern/MANTA.h b/intern/smoke/intern/MANTA.h
index de82be7..b241f2f 100644
--- a/intern/smoke/intern/MANTA.h
+++ b/intern/smoke/intern/MANTA.h
@@ -83,8 +83,8 @@ public:
 	
 	pthread_t manta_thread;
 	
-	void addGrid(float * data,string name, int x, int y, int z);
-	static void addAdaptiveGrid(float * data, string name, int minX, int minY, int minZ, int maxX, int maxY, int maxZ);
+	static void addGrid(void * data,string name, int x, int y, int z);
+	static void addAdaptiveGrid(void * data, string name, int minX, int minY, int minZ, int maxX, int maxY, int maxZ);
 };




More information about the Bf-blender-cvs mailing list