[Bf-blender-cvs] [1c2f537] soc-2014-fluid: paths for repositioned manta_pp folder correct

Roman Pogribnyi noreply at git.blender.org
Thu Jul 17 13:21:06 CEST 2014


Commit: 1c2f537505aabfe8391669e30412e404177d2e22
Author: Roman Pogribnyi
Date:   Thu Jul 17 09:47:02 2014 +0200
https://developer.blender.org/rB1c2f537505aabfe8391669e30412e404177d2e22

paths for repositioned manta_pp folder correct

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

M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/blenkernel/SConscript
M	source/blender/makesrna/intern/SConscript

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

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 289f7f5..774996e 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -387,7 +387,7 @@ endif()
 
 if(WITH_MOD_MANTA)
 	list(APPEND INC
-		../../../extern/manta_pp
+		../python/manta_pp
 	)
 	add_definitions(-DWITH_MANTA)
 endif()
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index 26598c7..05dd3cf 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -50,7 +50,7 @@ incs = [
     '#/intern/elbeem/extern',
     '#/intern/iksolver/extern',
     '#/intern/smoke/extern',
-    '#/extern/manta_pp',
+    '#/source/blender/python/manta_pp',
     '#/intern/atomic',
     '../avi',
     '../blenfont',
diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript
index c2d5a98..1acc1e8 100644
--- a/source/blender/makesrna/intern/SConscript
+++ b/source/blender/makesrna/intern/SConscript
@@ -61,7 +61,7 @@ incs = [
     '#/intern/audaspace/intern',
     '#/intern/cycles/blender',
     '#/intern/smoke/extern',
-    '#/extern/manta_pp',
+    '#/source//blender/python/manta_pp',
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',




More information about the Bf-blender-cvs mailing list