archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix build w/o fluidsim

Browse Source
This commit is contained in:
Campbell Barton
2018-07-05 12:26:10 +02:00
parent 03ef9f3214
commit 1517fa4309
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/modifiers/intern/MOD_fluidsim_util.c
View File

@@ -464,8 +464,8 @@ static Mesh *fluidsim_read_cache(
BLI_path_abs(targetFile, modifier_path_relbase_from_global(ob)); BLI_path_abs(targetFile, modifier_path_relbase_from_global(ob));
BLI_path_frame(targetFile, curFrame, 0); // fixed #frame-no BLI_path_frame(targetFile, curFrame, 0); // fixed #frame-no
/* assign material + flags to new dm /* assign material + flags to new mesh.
* if there's no faces in original dm, keep materials and flags unchanged */ * if there's no faces in original mesh, keep materials and flags unchanged */
mpoly = orgmesh->mpoly; mpoly = orgmesh->mpoly;
if (mpoly) { if (mpoly) {
mp_example = *mpoly; mp_example = *mpoly;
@@ -489,7 +489,7 @@ static Mesh *fluidsim_read_cache(
} }
} }
/* display org. object upon failure which is in dm */ /* display org. object upon failure which is in new mesh */
return NULL; return NULL;
} }
@@ -555,7 +555,6 @@ Mesh *fluidsimModifier_do(
/* unused */ /* unused */
(void)fluidmd; (void)fluidmd;
(void)ctx; (void)ctx;
(void)dm;
return NULL; return NULL;
#endif #endif
} }