Commit: 9c113a870a377ecaedebf800be6d7e37a874c176
Author: Daniel Genrich
Date: Thu Oct 23 16:36:01 2014 +0200
Branches: soc-2014-fluid
https://developer.blender.org/rB9c113a870a377ecaedebf800be6d7e37a874c176
Fix merge error (still some left)
Fix some path issues
===================================================================
M intern/smoke/CMakeLists.txt
M intern/smoke/intern/MANTA.h
M source/blender/python/intern/bpy_interface.c
===================================================================
diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt
index be0c621..54b4da4 100644
--- a/intern/smoke/CMakeLists.txt
+++ b/intern/smoke/CMakeLists.txt
@@ -26,6 +26,7 @@
set(INC
intern
../memutil
+ ../../source/blender/blenlib
)
set(INC_SYS
diff --git a/intern/smoke/intern/MANTA.h b/intern/smoke/intern/MANTA.h
index a7e0040..0e5d425 100644
--- a/intern/smoke/intern/MANTA.h
+++ b/intern/smoke/intern/MANTA.h
@@ -11,7 +11,9 @@
#include <pthread.h>
#include <Python.h>
#include <vector>
-#include "../../../source/blender/blenlib/BLI_path_util.h"
+
+#include "BLI_path_util.h"
+#include "BLI_winstuff.h"
void export_force_fields(int size_x, int size_y, int size_z, float *f_x,
float*f_y, float*f_z);/*defined in pymain.cpp*/
void export_em_fields(float *em_map, float flow_density, int min_x, int min_y,
int min_z, int max_x, int max_y, int max_z, int d_x, int d_y, int d_z, float
*inf, float *vel);/*defined in pymain.cpp*/
diff --git a/source/blender/python/intern/bpy_interface.c
b/source/blender/python/intern/bpy_interface.c
index 060cd4c..7131bc2 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -224,6 +224,7 @@ static struct _inittab bpy_internal_modules[] = {
{"bgl", BPyInit_bgl},
{"blf", BPyInit_blf},
{"bmesh", BPyInit_bmesh},
+ {"manta", BPyInit_Manta},
#if 0
{"bmesh.types", BPyInit_bmesh_types},
{"bmesh.utils", BPyInit_bmesh_utils},
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
