griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

- fixes elbeem SConscript file for python2.3

Browse Source 
- added temporary fix for 128+ resolutions
This commit is contained in:
Nils Thuerey
2005-09-21 13:30:39 +00:00
parent 10a790041b
commit e1fe7c88ec
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
intern/elbeem/SConscript
View File

@@ -4,24 +4,14 @@ Import('user_options_dict');
print "Including El'Beem Fluid Simulation..."
elbeem_env = library_env.Copy();
elbeem_env.Append(CXXFLAGS= ' -DNOGUI -DELBEEM_BLENDER=1 ');
elbeem_env.Append(CCFLAGS= ' -DNOGUI -DELBEEM_BLENDER=1 ');
#elbeem_env.Append(CPPPATH= '../src');
#elbeem_env.Append(CCPATH= '../src');
elbeem_env.Append(CPPDEFINES= 'NOGUI');
elbeem_env.Append(CPPDEFINES= 'ELBEEM_BLENDER=1');
elbeem_env.Append (CPPPATH = user_options_dict['PNG_INCLUDE'])
elbeem_env.Append (CPPPATH = user_options_dict['Z_INCLUDE'])
elbeem_env.Append (CPPPATH = user_options_dict['SDL_INCLUDE'])
elbeem_env.Append (CCPATH = user_options_dict['PNG_INCLUDE'])
elbeem_env.Append (CCPATH = user_options_dict['Z_INCLUDE'])
elbeem_env.Append (CCPATH = user_options_dict['SDL_INCLUDE'])
#Export('elbeem_env');
#SConscript(['src/SConscript'])
# main build----------------------------------------
#Import('elbeem_env');
#srcenv = elbeem_env.Copy();
Sources = [

3
source/blender/src/fluidsim.c
View File

@@ -254,7 +254,7 @@ void fluidsimBake(struct Object *ob)
// it would be more accurate to take into account geometry and no.
// fluid cells... max 1 for now...
if(fssDomain->resolutionxyz>128) {
fssDomain->maxRefine = 1;
fssDomain->maxRefine = 0; // disable for now
} else
if(fssDomain->resolutionxyz>64) {
fssDomain->maxRefine = 0;
@@ -336,7 +336,6 @@ void fluidsimBake(struct Object *ob)
" geoinit = 1; \n"
" geoinitid = 1; \n" "\n"
//" p_setup = \"caro\"; \n" // FIXME REMOVE?
" p_gravity = " "%f %f %f" /* 3,4,5 pGravity*/ "; #cfgset \n" "\n"
" timeadap = 1; \n"