diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-09 22:28:30 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-09 22:28:30 +0400 |
commit | 89a963fb7fdff543b77de790355b9dac3019bd33 (patch) | |
tree | 4e1d2245e20f8c21625e99d771776f66c233a0de /source/blender/blenlib | |
parent | de4bd55e01bc574c13977537ace1a0901dcfcaf0 (diff) |
style cleanup: comment blocks
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/BLI_utildefines.h | 2 | ||||
-rw-r--r-- | source/blender/blenlib/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/blenlib/intern/dynamiclist.h | 58 | ||||
-rw-r--r-- | source/blender/blenlib/intern/pbvh.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/string_cursor_utf8.c | 4 |
5 files changed, 4 insertions, 63 deletions
diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h index 26e8e8afeb7..06de3ff05fc 100644 --- a/source/blender/blenlib/BLI_utildefines.h +++ b/source/blender/blenlib/BLI_utildefines.h @@ -263,7 +263,7 @@ /* BLI_assert(), default only to print * for aborting need to define WITH_ASSERT_ABORT */ -#if !defined NDEBUG +#ifndef NDEBUG # ifdef WITH_ASSERT_ABORT # define _BLI_DUMMY_ABORT abort # else diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index d69ecbe325b..ddcc344e939 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -143,7 +143,6 @@ set(SRC BLI_voxel.h BLI_winstuff.h PIL_time.h - intern/dynamiclist.h ) if(WITH_BINRELOC) diff --git a/source/blender/blenlib/intern/dynamiclist.h b/source/blender/blenlib/intern/dynamiclist.h deleted file mode 100644 index 64c4a8fd61a..00000000000 --- a/source/blender/blenlib/intern/dynamiclist.h +++ /dev/null @@ -1,58 +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): Jiri Hnidek. - * - * Documentation of Two way dynamic list with access array can be found at: - * - * http://wiki.blender.org/bin/view.pl/Blenderwiki/DynamicListWithAccessArray - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** \file blender/blenlib/intern/dynamiclist.h - * \ingroup bli - */ - - -#ifndef __DYNAMICLIST_H__ -#define __DYNAMICLIST_H__ - -#define PAGE_SIZE 4 - -struct ListBase; - -/* - * Access array using realloc - */ -typedef struct DynamicArray{ - unsigned int count; /* count of items in list */ - unsigned int max_item_index; /* max available index */ - unsigned int last_item_index; /* max used index */ - void **items; /* dynamicaly allocated array of pointers - pointing at items in list */ -} DynamicArray; - -/* - * Two way dynamic list with access array - */ -typedef struct DynamicList { - struct DynamicArray da; /* access array */ - struct ListBase lb; /* two way linked dynamic list */ -} DynamicList; - -#endif diff --git a/source/blender/blenlib/intern/pbvh.c b/source/blender/blenlib/intern/pbvh.c index d0dc51d1a8a..dcf03590808 100644 --- a/source/blender/blenlib/intern/pbvh.c +++ b/source/blender/blenlib/intern/pbvh.c @@ -476,7 +476,7 @@ static void build_leaf(PBVH *bvh, int node_index, BBC *prim_bbc, } /* Return zero if all primitives in the node can be drawn with the - same material (including flat/smooth shading), non-zerootherwise */ + * same material (including flat/smooth shading), non-zerootherwise */ int leaf_needs_material_split(PBVH *bvh, int offset, int count) { int i, prim; diff --git a/source/blender/blenlib/intern/string_cursor_utf8.c b/source/blender/blenlib/intern/string_cursor_utf8.c index 08440b0e12b..56998cfd927 100644 --- a/source/blender/blenlib/intern/string_cursor_utf8.c +++ b/source/blender/blenlib/intern/string_cursor_utf8.c @@ -25,8 +25,8 @@ */ /** \file blender/blenlib/intern/string_cursor_utf8.c - * \ingroup bli - */ + * \ingroup bli + */ #include <stdio.h> #include <stdlib.h> |