[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51487] trunk/blender: remove LOD_Decimator (c++ decimator), now replaced by bmesh decimator.
Campbell Barton
ideasman42 at gmail.com
Mon Oct 22 04:39:29 CEST 2012
Revision: 51487
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51487
Author: campbellbarton
Date: 2012-10-22 02:39:26 +0000 (Mon, 22 Oct 2012)
Log Message:
-----------
remove LOD_Decimator (c++ decimator), now replaced by bmesh decimator. also remove CTR c++ classes that are no longer used.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/SConstruct
trunk/blender/build_files/cmake/cmake_consistency_check_config.py
trunk/blender/build_files/cmake/config/blender_lite.cmake
trunk/blender/build_files/scons/tools/btools.py
trunk/blender/intern/CMakeLists.txt
trunk/blender/intern/SConscript
trunk/blender/intern/container/CMakeLists.txt
trunk/blender/intern/container/CTR_HashedPtr.h
trunk/blender/intern/container/CTR_Map.h
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenkernel/SConscript
trunk/blender/source/blender/modifiers/CMakeLists.txt
trunk/blender/source/blender/modifiers/SConscript
trunk/blender/source/blender/modifiers/intern/MOD_decimate.c
trunk/blender/source/blenderplayer/CMakeLists.txt
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
trunk/blender/source/creator/CMakeLists.txt
trunk/blender/source/gameengine/Rasterizer/RAS_BucketManager.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_BucketManager.h
Removed Paths:
-------------
trunk/blender/intern/container/CTR_List.h
trunk/blender/intern/container/CTR_TaggedIndex.h
trunk/blender/intern/container/CTR_TaggedSetOps.h
trunk/blender/intern/container/CTR_UHeap.h
trunk/blender/intern/container/intern/
trunk/blender/intern/decimation/
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2012-10-22 02:20:41 UTC (rev 51486)
+++ trunk/blender/CMakeLists.txt 2012-10-22 02:39:26 UTC (rev 51487)
@@ -188,7 +188,6 @@
# Modifiers
option(WITH_MOD_FLUID "Enable Elbeem Modifier (Fluid Simulation)" ON)
option(WITH_MOD_SMOKE "Enable Smoke Modifier (Smoke Simulation)" ON)
-option(WITH_MOD_DECIMATE "Enable Decimate Modifier" ON)
option(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON)
option(WITH_MOD_REMESH "Enable Remesh Modifier" ON)
option(WITH_MOD_CLOTH_ELTOPO "Enable Experimental cloth solver" OFF)
@@ -2126,7 +2125,6 @@
info_cfg_text("Modifiers:")
info_cfg_option(WITH_MOD_BOOLEAN)
info_cfg_option(WITH_MOD_REMESH)
- info_cfg_option(WITH_MOD_DECIMATE)
info_cfg_option(WITH_MOD_FLUID)
info_cfg_option(WITH_MOD_OCEANSIM)
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2012-10-22 02:20:41 UTC (rev 51486)
+++ trunk/blender/SConstruct 2012-10-22 02:39:26 UTC (rev 51487)
@@ -264,7 +264,6 @@
target_env_defs['WITH_BF_FLUID'] = False
target_env_defs['WITH_BF_OCEANSIM'] = False
target_env_defs['WITH_BF_SMOKE'] = False
- target_env_defs['WITH_BF_DECIMATE'] = False
target_env_defs['WITH_BF_BOOLEAN'] = False
target_env_defs['WITH_BF_REMESH'] = False
target_env_defs['WITH_BF_PYTHON'] = False
Modified: trunk/blender/build_files/cmake/cmake_consistency_check_config.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_consistency_check_config.py 2012-10-22 02:20:41 UTC (rev 51486)
+++ trunk/blender/build_files/cmake/cmake_consistency_check_config.py 2012-10-22 02:39:26 UTC (rev 51487)
@@ -2,11 +2,9 @@
IGNORE = (
"/test/",
- "/decimate_glut_test/",
"/BSP_GhostTest/",
"/release/",
"/xembed/",
- "/decimation/intern/future/",
"/TerraplayNetwork/",
"/ik_glut_test/",
Modified: trunk/blender/build_files/cmake/config/blender_lite.cmake
===================================================================
--- trunk/blender/build_files/cmake/config/blender_lite.cmake 2012-10-22 02:20:41 UTC (rev 51486)
+++ trunk/blender/build_files/cmake/config/blender_lite.cmake 2012-10-22 02:39:26 UTC (rev 51487)
@@ -35,7 +35,6 @@
set(WITH_LZMA OFF CACHE FORCE BOOL)
set(WITH_LZO OFF CACHE FORCE BOOL)
set(WITH_MOD_BOOLEAN OFF CACHE FORCE BOOL)
-set(WITH_MOD_DECIMATE OFF CACHE FORCE BOOL)
set(WITH_MOD_FLUID OFF CACHE FORCE BOOL)
set(WITH_MOD_REMESH OFF CACHE FORCE BOOL)
set(WITH_MOD_SMOKE OFF CACHE FORCE BOOL)
Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py 2012-10-22 02:20:41 UTC (rev 51486)
+++ trunk/blender/build_files/scons/tools/btools.py 2012-10-22 02:39:26 UTC (rev 51487)
@@ -152,7 +152,6 @@
'WITH_BF_RAYOPTIMIZATION',
'BF_RAYOPTIMIZATION_SSE_FLAGS',
'WITH_BF_FLUID',
- 'WITH_BF_DECIMATE',
'WITH_BF_BOOLEAN',
'WITH_BF_REMESH',
'WITH_BF_OCEANSIM',
@@ -265,7 +264,6 @@
('BF_PYTHON_ABI_FLAGS', 'Python ABI flags (suffix in library version: m, mu, etc)', ''),
(BoolVariable('WITH_BF_FLUID', 'Build with Fluid simulation (Elbeem)', True)),
- (BoolVariable('WITH_BF_DECIMATE', 'Build with decimate modifier', True)),
(BoolVariable('WITH_BF_BOOLEAN', 'Build with boolean modifier', True)),
(BoolVariable('WITH_BF_REMESH', 'Build with remesh modifier', True)),
(BoolVariable('WITH_BF_OCEANSIM', 'Build with ocean simulation', False)),
Modified: trunk/blender/intern/CMakeLists.txt
===================================================================
--- trunk/blender/intern/CMakeLists.txt 2012-10-22 02:20:41 UTC (rev 51486)
+++ trunk/blender/intern/CMakeLists.txt 2012-10-22 02:39:26 UTC (rev 51487)
@@ -49,11 +49,6 @@
add_subdirectory(smoke)
endif()
-if(WITH_MOD_DECIMATE)
- add_subdirectory(container)
- add_subdirectory(decimation)
-endif()
-
if(WITH_MOD_BOOLEAN)
add_subdirectory(bsp)
endif()
Modified: trunk/blender/intern/SConscript
===================================================================
--- trunk/blender/intern/SConscript 2012-10-22 02:20:41 UTC (rev 51486)
+++ trunk/blender/intern/SConscript 2012-10-22 02:39:26 UTC (rev 51487)
@@ -6,9 +6,7 @@
'ghost/SConscript',
'guardedalloc/SConscript',
'moto/SConscript',
- 'container/SConscript',
'memutil/SConscript/',
- 'decimation/SConscript',
'iksolver/SConscript',
'itasc/SConscript',
'opencolorio/SConscript',
@@ -17,6 +15,9 @@
'smoke/SConscript',
'raskter/SConscript'])
+# currently only contains headers
+# SConscript('container/SConscript')
+
if env ['WITH_BF_REMESH']:
SConscript(['dualcon/SConscript'])
Modified: trunk/blender/intern/container/CMakeLists.txt
===================================================================
--- trunk/blender/intern/container/CMakeLists.txt 2012-10-22 02:20:41 UTC (rev 51486)
+++ trunk/blender/intern/container/CMakeLists.txt 2012-10-22 02:39:26 UTC (rev 51487)
@@ -33,14 +33,9 @@
)
set(SRC
- intern/CTR_List.cpp
-
CTR_HashedPtr.h
- CTR_List.h
CTR_Map.h
- CTR_TaggedIndex.h
- CTR_TaggedSetOps.h
- CTR_UHeap.h
)
+# infact nothing to compile!
blender_add_lib(bf_intern_ctr "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/intern/container/CTR_HashedPtr.h
===================================================================
--- trunk/blender/intern/container/CTR_HashedPtr.h 2012-10-22 02:20:41 UTC (rev 51486)
+++ trunk/blender/intern/container/CTR_HashedPtr.h 2012-10-22 02:39:26 UTC (rev 51487)
@@ -30,8 +30,8 @@
* \ingroup ctr
*/
-#ifndef CTR_HASHEDPTR_H
-#define CTR_HASHEDPTR_H
+#ifndef __CTR_HASHEDPTR_H__
+#define __CTR_HASHEDPTR_H__
#include <stdlib.h>
@@ -51,5 +51,5 @@
void *getValue() const { return m_valptr; }
};
-#endif //CTR_HASHEDPTR_H
+#endif /* __CTR_HASHEDPTR_H__ */
Deleted: trunk/blender/intern/container/CTR_List.h
===================================================================
--- trunk/blender/intern/container/CTR_List.h 2012-10-22 02:20:41 UTC (rev 51486)
+++ trunk/blender/intern/container/CTR_List.h 2012-10-22 02:39:26 UTC (rev 51487)
@@ -1,112 +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) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file container/CTR_List.h
- * \ingroup ctr
- */
-
-
-
-#ifndef CTR_LIST_H
-#define CTR_LIST_H
-
-class CTR_Link {
-public:
- CTR_Link(
- );
-
- CTR_Link(
- CTR_Link *next,
- CTR_Link *prev
- );
-
- CTR_Link *
- getNext(
- ) const;
-
- CTR_Link *
- getPrev(
- ) const;
-
- bool
- isHead(
- ) const;
-
- bool
- isTail(
- ) const;
-
- void
- insertBefore(
- CTR_Link *link
- );
-
- void
- insertAfter(
- CTR_Link *link
- );
-
- void
- remove(
- );
-
-private:
- CTR_Link *m_next;
- CTR_Link *m_prev;
-};
-
-class CTR_List {
-public:
-
- CTR_List(
- );
-
- CTR_Link *
- getHead(
- ) const;
-
- CTR_Link *
- getTail(
- ) const;
-
- void
- addHead(
- CTR_Link *link
- );
-
- void
- addTail(
- CTR_Link *link
- );
-
-private:
- CTR_Link m_head;
- CTR_Link m_tail;
-};
-
-#endif
-
Modified: trunk/blender/intern/container/CTR_Map.h
===================================================================
--- trunk/blender/intern/container/CTR_Map.h 2012-10-22 02:20:41 UTC (rev 51486)
+++ trunk/blender/intern/container/CTR_Map.h 2012-10-22 02:39:26 UTC (rev 51487)
@@ -29,10 +29,9 @@
* \ingroup ctr
*/
+#ifndef __CTR_MAP_H__
+#define __CTR_MAP_H__
-#ifndef CTR_MAP_H
-#define CTR_MAP_H
-
template <class Key, class Value>
class CTR_Map {
private:
@@ -177,5 +176,4 @@
Entry **m_buckets;
};
-#endif
-
+#endif /* __CTR_MAP_H__ */
Deleted: trunk/blender/intern/container/CTR_TaggedIndex.h
===================================================================
--- trunk/blender/intern/container/CTR_TaggedIndex.h 2012-10-22 02:20:41 UTC (rev 51486)
+++ trunk/blender/intern/container/CTR_TaggedIndex.h 2012-10-22 02:39:26 UTC (rev 51487)
@@ -1,219 +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) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file container/CTR_TaggedIndex.h
- * \ingroup ctr
- */
-
-
-/**
-
- * Copyright (C) 2001 NaN Technologies B.V.
- * Simple tagged index class.
- */
-
-#ifndef __CTR_TAGGEDINDEX_H__
-#define __CTR_TAGGEDINDEX_H__
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list