[Bf-blender-cvs] [1517fa43097] blender2.8: Fix build w/o fluidsim

Campbell Barton noreply at git.blender.org
Thu Jul 5 12:27:22 CEST 2018


Commit: 1517fa43097a3925b5fd1d4b8738fd56fde17bc8
Author: Campbell Barton
Date:   Thu Jul 5 12:26:10 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB1517fa43097a3925b5fd1d4b8738fd56fde17bc8

Fix build w/o fluidsim

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

M	source/blender/modifiers/intern/MOD_fluidsim_util.c

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

diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.c b/source/blender/modifiers/intern/MOD_fluidsim_util.c
index 963296f80f6..edd7a7a331c 100644
--- a/source/blender/modifiers/intern/MOD_fluidsim_util.c
+++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c
@@ -464,8 +464,8 @@ static Mesh *fluidsim_read_cache(
 	BLI_path_abs(targetFile, modifier_path_relbase_from_global(ob));
 	BLI_path_frame(targetFile, curFrame, 0); // fixed #frame-no
 
-	/* assign material + flags to new dm
-	 * if there's no faces in original dm, keep materials and flags unchanged */
+	/* assign material + flags to new mesh.
+	 * if there's no faces in original mesh, keep materials and flags unchanged */
 	mpoly = orgmesh->mpoly;
 	if (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;
 	}
 
@@ -555,7 +555,6 @@ Mesh *fluidsimModifier_do(
 	/* unused */
 	(void)fluidmd;
 	(void)ctx;
-	(void)dm;
 	return NULL;
 #endif
 }



More information about the Bf-blender-cvs mailing list