Commit: 4256c72ae3b4b6db8406803065ebb1924bb9fcb1
Author: Roman Pogribnyi
Date: Thu Oct 30 16:36:06 2014 +0100
Branches: soc-2014-fluid
https://developer.blender.org/rB4256c72ae3b4b6db8406803065ebb1924bb9fcb1
working with manta compiler flag
===================================================================
M CMakeLists.txt
M intern/ghost/intern/GHOST_ContextCGL.mm
M intern/ghost/intern/GHOST_WindowCocoa.mm
M intern/smoke/extern/smoke_API.h
M intern/smoke/intern/smoke_API.cpp
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenkernel/intern/smoke.c
M source/blender/editors/space_file/fsmenu.c
M source/blender/makesdna/DNA_smoke_types.h
M source/blender/makesrna/intern/CMakeLists.txt
M source/blender/render/CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c412057..d66610c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2363,7 +2363,9 @@ endif()
#-----------------------------------------------------------------------------
# Configure mantaflow.
-
+if(WITH_MOD_MANTA)
+ add_definitions(-DWITH_MANTA)
+endif()
#if(WITH_MOD_MANTA)
# message("including manta")
diff --git a/intern/ghost/intern/GHOST_ContextCGL.mm
b/intern/ghost/intern/GHOST_ContextCGL.mm
index b96a1dc..c55935d 100644
--- a/intern/ghost/intern/GHOST_ContextCGL.mm
+++ b/intern/ghost/intern/GHOST_ContextCGL.mm
@@ -195,7 +195,7 @@ static void makeAttribList(
#if defined(__ppc__) || defined(__ppc64__)
attribs.push_back(kCGLRendererAppleSWID);
#else
- attribs.push_back(kCGLRendererGenericFloatID);
+ // attribs.push_back(kCGLRendererGenericFloatID);
#endif
}
else {
diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm
b/intern/ghost/intern/GHOST_WindowCocoa.mm
index 44b3c5b..6fb73a3 100644
--- a/intern/ghost/intern/GHOST_WindowCocoa.mm
+++ b/intern/ghost/intern/GHOST_WindowCocoa.mm
@@ -1344,15 +1344,15 @@ GHOST_TSuccess GHOST_WindowCocoa::endProgressBar()
// With OSX 10.8 and later, we can use notifications to inform the user
when the progress reached 100%
// Atm. just fire this when the progressbar ends, the behavior is
controlled in the NotificationCenter
// If Blender is not frontmost window, a message pops up with sound, in
any case an entry in notifications
-
- if ([NSUserNotificationCenter
respondsToSelector:@selector(defaultUserNotificationCenter)]) {
- NSUserNotification *notification = [[NSUserNotification alloc]
init];
- notification.title = @"Blender progress notification";
- notification.informativeText = @"Calculation ended";
- notification.soundName = NSUserNotificationDefaultSoundName;
- [[NSUserNotificationCenter defaultUserNotificationCenter]
deliverNotification:notification];
- [notification release];
- }
+//PR commented temporarily
+// if ([NSUserNotificationCenter
respondsToSelector:@selector(defaultUserNotificationCenter)]) {
+// NSUserNotification *notification = [[NSUserNotification alloc]
init];
+// notification.title = @"Blender progress notification";
+// notification.informativeText = @"Calculation ended";
+// notification.soundName = NSUserNotificationDefaultSoundName;
+// [[NSUserNotificationCenter defaultUserNotificationCenter]
deliverNotification:notification];
+// [notification release];
+// }
[dockIcon release];
diff --git a/intern/smoke/extern/smoke_API.h b/intern/smoke/extern/smoke_API.h
index b0f11f5..e83a73b 100644
--- a/intern/smoke/extern/smoke_API.h
+++ b/intern/smoke/extern/smoke_API.h
@@ -36,8 +36,7 @@ extern "C" {
#endif
-#define USE_MANTA
-#ifndef USE_MANTA /*old Blender Solver*/
+#ifndef WITH_MANTA /*old Blender Solver*/
struct FLUID_3D;
// low res
@@ -187,7 +186,7 @@ void smoke_ensure_colors(struct FLUID_3D *fluid, struct
WTURBULENCE *wt, float i
void smoke_ensure_heat(struct Manta_API *fluid);
void smoke_ensure_fire(struct Manta_API *fluid, struct WTURBULENCE *wt);
void smoke_ensure_colors(struct Manta_API *fluid, struct WTURBULENCE
*wt, float init_r, float init_g, float init_b);
-#endif /*USE_MANTA*/
+#endif /*WITH_MANTA*/
/*Mantaflow functions*/
int smoke_mantaflow_read(struct SmokeDomainSettings *sds, char* name, bool
with_wavelets); //1:success, 0: no file,error
diff --git a/intern/smoke/intern/smoke_API.cpp
b/intern/smoke/intern/smoke_API.cpp
index faeeb15..4222103 100644
--- a/intern/smoke/intern/smoke_API.cpp
+++ b/intern/smoke/intern/smoke_API.cpp
@@ -42,11 +42,15 @@
-#define USE_MANTA
-#ifdef USE_MANTA
+#ifdef WITH_MANTA
extern "C" Manta_API *smoke_init(int *res, float dx, float dtdef, int
use_heat, int use_fire, int use_colors, struct SmokeDomainSettings *sds)
{
+#ifdef WITH_MANTA
+ cout << "smoke-MANTA_DEFINED_________" << endl;
+#else
+ cout << "smoke-MANTA_NOT_DEFINED_________" << endl;
+#endif
Manta_API *fluid = new Manta_API(res, dx, dtdef, use_heat, use_fire,
use_colors,sds);
return fluid;
}
diff --git a/source/blender/blenkernel/CMakeLists.txt
b/source/blender/blenkernel/CMakeLists.txt
index 6f42254..2a857a3 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -390,12 +390,9 @@ if(WITH_MOD_SMOKE)
add_definitions(-DWITH_SMOKE)
endif()
-#if(WITH_MOD_MANTA)
-# list(APPEND INC
-# ../python/manta_pp
-# )
-# add_definitions(-DWITH_MANTA)
-#endif()
+if(WITH_MOD_MANTA)
+ add_definitions(-DWITH_MANTA)
+endif()
if(WITH_MOD_OCEANSIM)
add_definitions(-DWITH_OCEANSIM)
diff --git a/source/blender/blenkernel/intern/smoke.c
b/source/blender/blenkernel/intern/smoke.c
index 60cba7b..759070b 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -169,7 +169,6 @@ void flame_get_spectrum(unsigned char *UNUSED(spec), int
UNUSED(width), float UN
#ifdef WITH_SMOKE
-#define USE_MANTA
void smoke_reallocate_fluid(SmokeDomainSettings *sds, float dx, int res[3],
int free_old)
{
int use_heat = (sds->active_fields & SM_ACTIVE_HEAT);
@@ -2442,7 +2441,7 @@ static void update_effectors(Scene *scene, Object *ob,
SmokeDomainSettings *sds,
float voxelCenter[3] = {0, 0, 0},
vel[3] = {0, 0, 0}, retvel[3] = {0, 0, 0};
unsigned int index = smoke_get_index(x,
sds->res[0], y, sds->res[1], z);
-#ifndef USE_MANTA
+#ifndef WITH_MANTA
if (((fuel ? MAX2(density[index],
fuel[index]) : density[index]) < FLT_EPSILON) || obstacle[index])
continue;
#endif
diff --git a/source/blender/editors/space_file/fsmenu.c
b/source/blender/editors/space_file/fsmenu.c
index c117b8c..09cbd0a 100644
--- a/source/blender/editors/space_file/fsmenu.c
+++ b/source/blender/editors/space_file/fsmenu.c
@@ -447,7 +447,7 @@ void fsmenu_read_system(struct FSMenu *fsmenu, int
read_bookmarks)
/* Exclude "all my files" as it makes no sense
in blender fileselector */
/* Exclude "airdrop" if wlan not active as it
would show "" ) */
if (!strstr(line, "myDocuments.cannedSearch")
&& (*line != '\0')) {
- fsmenu_insert_entry(fsmenu,
FS_CATEGORY_SYSTEM_BOOKMARKS, line, NULL);
+ fsmenu_insert_entry(fsmenu,
FS_CATEGORY_SYSTEM_BOOKMARKS, line, 0);
}
CFRelease(pathString);
diff --git a/source/blender/makesdna/DNA_smoke_types.h
b/source/blender/makesdna/DNA_smoke_types.h
index 285e43e..f8769ed 100644
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@ -89,8 +89,7 @@ typedef struct SmokeSolvers{
}SmokeSolvers;
-#define USE_MANTA
-#ifndef USE_MANTA /*Use old SDS with FLUID_3D object*/
+#ifndef WITH_MANTA /*Use old SDS with FLUID_3D object*/
typedef struct SmokeDomainSettings {
struct SmokeModifierData *smd; /* for fast RNA access */
struct FLUID_3D *fluid;
diff --git a/source/blender/makesrna/intern/CMakeLists.txt
b/source/blender/makesrna/intern/CMakeLists.txt
index 5d736f9..738e4f7 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -236,6 +236,10 @@ if(WITH_MOD_SMOKE)
add_definitions(-DWITH_SMOKE)
endif()
+if(WITH_MOD_MANTA)
+ add_definitions(-DWITH_MANTA)
+endif()
+
if(WITH_MOD_OCEANSIM)
add_definitions(-DWITH_OCEANSIM)
endif()
diff --git a/source/blender/render/CMakeLists.txt
b/source/blender/render/CMakeLists.txt
index e516c95..8d64d70 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -137,6 +137,10 @@ if(WITH_MOD_SMOKE)
add_definitions(-DWITH_SMOKE)
endif()
+if(WITH_MOD_MANTA)
+ add_definitions(-DWITH_MANTA)
+endif()
+
if(WITH_FREESTYLE)
list(APPEND INC
../freestyle
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
