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:
authorCampbell Barton <ideasman42@gmail.com>2018-02-09 05:56:49 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-02-09 05:56:49 +0300
commit9b9861578d9f9e61ecdb0d0753df5df1e376ecb7 (patch)
tree34fc6ad7955b7be37ca3120247aa80aab5f7c9e8 /build_files
parent518d59970df80fa5ad75c2cb5e5093826f175b29 (diff)
parent8f9386596fb0471c972921e6543b3a0adc3ffb3d (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
-rw-r--r--build_files/cmake/cmake_consistency_check_config.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/build_files/cmake/cmake_consistency_check_config.py b/build_files/cmake/cmake_consistency_check_config.py
index 9ec1c095a9c..2fbf855c386 100644
--- a/build_files/cmake/cmake_consistency_check_config.py
+++ b/build_files/cmake/cmake_consistency_check_config.py
@@ -25,10 +25,6 @@ IGNORE = (
"extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h",
"extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h",
"extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h",
- "extern/carve/include/carve/config.h",
- "extern/carve/include/carve/random/random.h",
- "extern/carve/patches/files/config.h",
- "extern/carve/patches/files/random.h",
"intern/audaspace/SRC/AUD_SRCResampleFactory.h",
"intern/audaspace/SRC/AUD_SRCResampleReader.h",
)