diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-12-31 11:06:51 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-31 11:06:51 +0400 |
| commit | c9d16fd22cb55666225044604d2da3c4156de4ae (patch) | |
| tree | fb6c9585943a596fac43d2b4ef8659cd022f3633 | |
| parent | 827f9aa737e32cbb962864c25fa7ede88ccd99c5 (diff) | |
add ".hh" as an extension for source scripts.
| -rwxr-xr-x | build_files/cmake/cmake_consistency_check.py | 4 | ||||
| -rwxr-xr-x | build_files/cmake/project_info.py | 2 | ||||
| -rw-r--r-- | build_files/cmake/project_source_info.py | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/pbvh_bmesh.c | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/pbvh_intern.h | 2 | ||||
| -rw-r--r-- | source/tests/check_deprecated.py | 4 |
6 files changed, 7 insertions, 10 deletions
diff --git a/build_files/cmake/cmake_consistency_check.py b/build_files/cmake/cmake_consistency_check.py index b13b0ddb424..665bc600efa 100755 --- a/build_files/cmake/cmake_consistency_check.py +++ b/build_files/cmake/cmake_consistency_check.py @@ -75,12 +75,12 @@ def is_cmake(filename): def is_c_header(filename): ext = splitext(filename)[1] - return (ext in (".h", ".hpp", ".hxx")) + return (ext in {".h", ".hpp", ".hxx", ".hh"}) def is_c(filename): ext = splitext(filename)[1] - return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl")) + return (ext in {".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl"}) def is_c_any(filename): diff --git a/build_files/cmake/project_info.py b/build_files/cmake/project_info.py index 34f378a58dd..495ca71263e 100755 --- a/build_files/cmake/project_info.py +++ b/build_files/cmake/project_info.py @@ -97,7 +97,7 @@ def is_cmake(filename): def is_c_header(filename): ext = splitext(filename)[1] - return (ext in (".h", ".hpp", ".hxx")) + return (ext in {".h", ".hpp", ".hxx", ".hh"}) def is_py(filename): diff --git a/build_files/cmake/project_source_info.py b/build_files/cmake/project_source_info.py index 10bc36ba1a8..69d09b05ac7 100644 --- a/build_files/cmake/project_source_info.py +++ b/build_files/cmake/project_source_info.py @@ -43,7 +43,7 @@ SOURCE_DIR = abspath(SOURCE_DIR) def is_c_header(filename): ext = os.path.splitext(filename)[1] - return (ext in (".h", ".hpp", ".hxx")) + return (ext in {".h", ".hpp", ".hxx", ".hh"}) def is_c(filename): diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c index d13ec78d604..5d60957abcb 100644 --- a/source/blender/blenkernel/intern/pbvh_bmesh.c +++ b/source/blender/blenkernel/intern/pbvh_bmesh.c @@ -20,9 +20,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" - -#include "BLI_array.h" #include "BLI_buffer.h" #include "BLI_ghash.h" #include "BLI_heap.h" diff --git a/source/blender/blenkernel/intern/pbvh_intern.h b/source/blender/blenkernel/intern/pbvh_intern.h index d8365ce8006..b3f7bf6e3d1 100644 --- a/source/blender/blenkernel/intern/pbvh_intern.h +++ b/source/blender/blenkernel/intern/pbvh_intern.h @@ -35,7 +35,7 @@ typedef struct { * union'd structs */ struct PBVHNode { /* Opaque handle for drawing code */ - GPU_Buffers *draw_buffers; + struct GPU_Buffers *draw_buffers; /* Voxel bounds */ BB vb; diff --git a/source/tests/check_deprecated.py b/source/tests/check_deprecated.py index c5c7bdcdcb0..bb9fcd818d2 100644 --- a/source/tests/check_deprecated.py +++ b/source/tests/check_deprecated.py @@ -31,12 +31,12 @@ SKIP_DIRS = ("extern", def is_c_header(filename): ext = splitext(filename)[1] - return (ext in (".h", ".hpp", ".hxx")) + return (ext in {".h", ".hpp", ".hxx", ".hh"}) def is_c(filename): ext = splitext(filename)[1] - return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl")) + return (ext in {".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl"}) def is_c_any(filename): |