Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@stuvel.eu>2018-05-09 13:41:32 +0300
committerSybren A. Stüvel <sybren@stuvel.eu>2018-05-09 13:41:32 +0300
commit1cc7d7d5ecf7f86930ba4ac6a9948ac93af29dac (patch)
treeffc9153cd6596d8fef06d75889dc3f5e8a14830e
parent2862b58a3882fa403c0277d0da5804ba71915c12 (diff)
Surface Deform mod: removed some stuff that shouldn't have been committed
-rw-r--r--source/blender/editors/object/object_modifier.c2
-rw-r--r--source/blender/modifiers/CMakeLists.txt1
-rw-r--r--source/blender/modifiers/MOD_modifier_helpers.h39
-rw-r--r--source/blender/modifiers/intern/MOD_surfacedeform.c1
4 files changed, 0 insertions, 43 deletions
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 2e922e7f963..917210390b1 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -90,8 +90,6 @@
#include "WM_api.h"
#include "WM_types.h"
-#include "MOD_modifier_helpers.h"
-
#include "object_intern.h"
static void modifier_skin_customdata_delete(struct Object *ob);
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index 3707819f1fe..397a3263e22 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -106,7 +106,6 @@ set(SRC
intern/MOD_weightvgproximity.c
intern/MOD_wireframe.c
- MOD_modifier_helpers
MOD_modifiertypes.h
intern/MOD_fluidsim_util.h
intern/MOD_meshcache_util.h
diff --git a/source/blender/modifiers/MOD_modifier_helpers.h b/source/blender/modifiers/MOD_modifier_helpers.h
deleted file mode 100644
index 0356bf74d43..00000000000
--- a/source/blender/modifiers/MOD_modifier_helpers.h
+++ /dev/null
@@ -1,39 +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.
- *
- * Contributor(s): Blender Foundation
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file MOD_modifier_helpers.h
- * \ingroup modifiers
- *
- * Modifier-specific functions that should be accessible from outside the modifiers module.
- */
-
-#ifndef __MOD_MODIFIER_HELPERS_H__
-#define __MOD_MODIFIER_HELPERS_H__
-
-struct Object;
-struct SurfaceDeformModifierData;
-
-/* Defined in MOD_surfacedeform.c */
-bool MOD_surfacedeform_bind(struct Object *ob, struct SurfaceDeformModifierData *smd);
-
-
-#endif /* __MOD_MODIFIER_HELPERS_H__ */
diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c b/source/blender/modifiers/intern/MOD_surfacedeform.c
index ea12d8995b6..650e02241db 100644
--- a/source/blender/modifiers/intern/MOD_surfacedeform.c
+++ b/source/blender/modifiers/intern/MOD_surfacedeform.c
@@ -20,7 +20,6 @@
#include "MEM_guardedalloc.h"
-#include "MOD_modifier_helpers.h"
#include "MOD_util.h"
typedef struct SDefAdjacency {