[Bf-blender-cvs] [04c7894] master: Cleanup: remove unused fluidsim members

[Campbell Barton]

Commit: 04c7894f4d36ab7eef5126efb00db7433428eb8e
Author: Campbell Barton
Date:   Thu Oct 8 18:17:10 2015 +1100
Branches: master
https://developer.blender.org/rB04c7894f4d36ab7eef5126efb00db7433428eb8e

Cleanup: remove unused fluidsim members

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

M	source/blender/editors/object/object_add.c
M	source/blender/makesdna/DNA_object_fluidsim.h

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

diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 615fbb5..a5dc2d9 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -2023,9 +2023,6 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, Base *base
 					ID_NEW_US2(obn->data)
 					else {
 						obn->data = BKE_mesh_copy(obn->data);
-						if (obn->fluidsimSettings) {
-							obn->fluidsimSettings->orgMesh = (Mesh *)obn->data;
-						}
 						didit = 1;
 					}
 					id->us--;
diff --git a/source/blender/makesdna/DNA_object_fluidsim.h b/source/blender/makesdna/DNA_object_fluidsim.h
index aaebdf57..a714195 100644
--- a/source/blender/makesdna/DNA_object_fluidsim.h
+++ b/source/blender/makesdna/DNA_object_fluidsim.h
@@ -88,11 +88,6 @@ typedef struct FluidsimSettings {
 	/* gravity strength */
 	float iniVelx, iniVely, iniVelz;
 
-	/* store pointer to original mesh (for replacing the current one) */
-	struct Mesh *orgMesh;
-	/* a mesh to display the bounding box used for simulation */
-	struct Mesh *meshBB;
-
 	/* store output path, and file prefix for baked fluid surface */
 	/* strlens; 256= FILE_MAXFILE, 768= FILE_MAXDIR */
 	char surfdataPath[1024];