[Bf-blender-cvs] [0309a7b] master: Code cleanup: remove unused header

Campbell Barton noreply at git.blender.org
Wed Apr 30 21:08:20 CEST 2014


Commit: 0309a7b9a95a3411ab7fcdab75ffbe67779d9820
Author: Campbell Barton
Date:   Thu May 1 05:07:48 2014 +1000
https://developer.blender.org/rB0309a7b9a95a3411ab7fcdab75ffbe67779d9820

Code cleanup: remove unused header

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

D	source/blender/editors/include/ED_fluidsim.h
M	source/blender/editors/physics/physics_fluid.c
M	source/blender/editors/util/CMakeLists.txt

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

diff --git a/source/blender/editors/include/ED_fluidsim.h b/source/blender/editors/include/ED_fluidsim.h
deleted file mode 100644
index 4790dc5..0000000
--- a/source/blender/editors/include/ED_fluidsim.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file ED_fluidsim.h
- *  \ingroup editors
- */
-
-#ifndef __ED_FLUIDSIM_H__
-#define __ED_FLUIDSIM_H__
-
-struct Object;
-struct FluidsimSettings;
-
-
-/* allocates and initializes fluidsim data */
-struct FluidsimSettings *fluidsimSettingsNew(struct Object *srcob);
-
-/* frees internal data itself */
-void fluidsimSettingsFree(struct FluidsimSettings *sb);
-
-/* duplicate internal data */
-struct FluidsimSettings *fluidsimSettingsCopy(struct FluidsimSettings *sb);
-
-#endif /* __ED_FLUIDSIM_H__ */
diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c
index 05abd0e..3972ed1 100644
--- a/source/blender/editors/physics/physics_fluid.c
+++ b/source/blender/editors/physics/physics_fluid.c
@@ -1086,22 +1086,6 @@ static void UNUSED_FUNCTION(fluidsimFreeBake)(Object *UNUSED(ob))
 
 #else /* WITH_MOD_FLUID */
 
-/* compile dummy functions for disabled fluid sim */
-
-FluidsimSettings *fluidsimSettingsNew(Object *UNUSED(srcob))
-{
-	return NULL;
-}
-
-void fluidsimSettingsFree(FluidsimSettings *UNUSED(fss))
-{
-}
-
-FluidsimSettings *fluidsimSettingsCopy(FluidsimSettings *UNUSED(fss))
-{
-	return NULL;
-}
-
 /* only compile dummy functions */
 static int fluidsimBake(bContext *UNUSED(C), ReportList *UNUSED(reports), Object *UNUSED(ob), short UNUSED(do_job))
 {
diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt
index 9f515bf..95e01d8 100644
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -53,7 +53,6 @@ set(SRC
 	../include/ED_curve.h
 	../include/ED_datafiles.h
 	../include/ED_fileselect.h
-	../include/ED_fluidsim.h
 	../include/ED_gpencil.h
 	../include/ED_image.h
 	../include/ED_info.h




More information about the Bf-blender-cvs mailing list