Sv. Lockal
52eb61f84b
In previous optimization in outliner I assumed that order in treehash was not important. But testing outliner in datablocks mode revealed a problem: when user expands multiple recursive levels and then closes any element, it always closed the top level of recursion. Now it should work fine with recursive trees. Now treehash contains groups of elements indexed by (id,nr,type). Adding an element with the same (id,nr,type) results in appending it to existing group. No duplicates are possible in treehash. This commit should also make lookups a little bit faster, because searching in small arrays by "used" is faster than searching in hashtable with duplicates by "id,nr,type,used".
438 lines
7.5 KiB
CMake
438 lines
7.5 KiB
CMake
# ***** 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) 2006, Blender Foundation
|
|
# All rights reserved.
|
|
#
|
|
# The Original Code is: all of this file.
|
|
#
|
|
# Contributor(s): Jacques Beaurain.
|
|
#
|
|
# ***** END GPL LICENSE BLOCK *****
|
|
|
|
set(INC
|
|
.
|
|
../blenfont
|
|
../blenlib
|
|
../blenloader
|
|
../gpu
|
|
../ikplugin
|
|
../imbuf
|
|
../makesdna
|
|
../makesrna
|
|
../bmesh
|
|
../modifiers
|
|
../nodes
|
|
../render/extern/include
|
|
../../../intern/guardedalloc
|
|
../../../intern/iksolver/extern
|
|
../../../intern/memutil
|
|
../../../intern/mikktspace
|
|
../../../intern/opennl/extern
|
|
../../../intern/raskter
|
|
../../../intern/smoke/extern
|
|
../../../extern/libmv
|
|
../../../intern/atomic
|
|
|
|
# XXX - BAD LEVEL CALL WM_api.h
|
|
../windowmanager
|
|
)
|
|
|
|
set(INC_SYS
|
|
${GLEW_INCLUDE_PATH}
|
|
${ZLIB_INCLUDE_DIRS}
|
|
)
|
|
|
|
set(SRC
|
|
intern/CCGSubSurf.c
|
|
intern/DerivedMesh.c
|
|
intern/action.c
|
|
intern/addon.c
|
|
intern/anim.c
|
|
intern/anim_sys.c
|
|
intern/armature.c
|
|
intern/autoexec.c
|
|
intern/blender.c
|
|
intern/bmfont.c
|
|
intern/boids.c
|
|
intern/bpath.c
|
|
intern/brush.c
|
|
intern/bullet.c
|
|
intern/bvhutils.c
|
|
intern/camera.c
|
|
intern/cdderivedmesh.c
|
|
intern/cloth.c
|
|
intern/collision.c
|
|
intern/colortools.c
|
|
intern/constraint.c
|
|
intern/context.c
|
|
intern/curve.c
|
|
intern/customdata.c
|
|
intern/customdata_file.c
|
|
intern/deform.c
|
|
intern/depsgraph.c
|
|
intern/displist.c
|
|
intern/dynamicpaint.c
|
|
intern/editderivedmesh.c
|
|
intern/editmesh.c
|
|
intern/editmesh_bvh.c
|
|
intern/effect.c
|
|
intern/fcurve.c
|
|
intern/fluidsim.c
|
|
intern/fmodifier.c
|
|
intern/font.c
|
|
intern/freestyle.c
|
|
intern/gpencil.c
|
|
intern/group.c
|
|
intern/icons.c
|
|
intern/idcode.c
|
|
intern/idprop.c
|
|
intern/image.c
|
|
intern/image_gen.c
|
|
intern/implicit.c
|
|
intern/ipo.c
|
|
intern/key.c
|
|
intern/lamp.c
|
|
intern/lattice.c
|
|
intern/library.c
|
|
intern/linestyle.c
|
|
intern/mask.c
|
|
intern/mask_evaluate.c
|
|
intern/mask_rasterize.c
|
|
intern/material.c
|
|
intern/mball.c
|
|
intern/mesh.c
|
|
intern/mesh_validate.c
|
|
intern/modifier.c
|
|
intern/modifiers_bmesh.c
|
|
intern/movieclip.c
|
|
intern/multires.c
|
|
intern/nla.c
|
|
intern/node.c
|
|
intern/object.c
|
|
intern/object_deform.c
|
|
intern/ocean.c
|
|
intern/packedFile.c
|
|
intern/paint.c
|
|
intern/particle.c
|
|
intern/particle_system.c
|
|
intern/pbvh.c
|
|
intern/pbvh_bmesh.c
|
|
intern/pointcache.c
|
|
intern/property.c
|
|
intern/report.c
|
|
intern/rigidbody.c
|
|
intern/sca.c
|
|
intern/scene.c
|
|
intern/screen.c
|
|
intern/seqcache.c
|
|
intern/seqeffects.c
|
|
intern/seqmodifier.c
|
|
intern/sequencer.c
|
|
intern/shrinkwrap.c
|
|
intern/sketch.c
|
|
intern/smoke.c
|
|
intern/softbody.c
|
|
intern/sound.c
|
|
intern/speaker.c
|
|
intern/subsurf_ccg.c
|
|
intern/suggestions.c
|
|
intern/text.c
|
|
intern/texture.c
|
|
intern/tracking.c
|
|
intern/treehash.c
|
|
intern/unit.c
|
|
intern/world.c
|
|
intern/writeavi.c
|
|
intern/writeframeserver.c
|
|
|
|
BKE_DerivedMesh.h
|
|
BKE_action.h
|
|
BKE_addon.h
|
|
BKE_anim.h
|
|
BKE_animsys.h
|
|
BKE_armature.h
|
|
BKE_autoexec.h
|
|
BKE_blender.h
|
|
BKE_bmfont.h
|
|
BKE_bmfont_types.h
|
|
BKE_boids.h
|
|
BKE_bpath.h
|
|
BKE_brush.h
|
|
BKE_bullet.h
|
|
BKE_bvhutils.h
|
|
BKE_camera.h
|
|
BKE_ccg.h
|
|
BKE_cdderivedmesh.h
|
|
BKE_cloth.h
|
|
BKE_collision.h
|
|
BKE_colortools.h
|
|
BKE_constraint.h
|
|
BKE_context.h
|
|
BKE_curve.h
|
|
BKE_customdata.h
|
|
BKE_customdata_file.h
|
|
BKE_deform.h
|
|
BKE_depsgraph.h
|
|
BKE_displist.h
|
|
BKE_dynamicpaint.h
|
|
BKE_effect.h
|
|
BKE_fcurve.h
|
|
BKE_fluidsim.h
|
|
BKE_font.h
|
|
BKE_freestyle.h
|
|
BKE_global.h
|
|
BKE_gpencil.h
|
|
BKE_group.h
|
|
BKE_icons.h
|
|
BKE_idcode.h
|
|
BKE_idprop.h
|
|
BKE_image.h
|
|
BKE_ipo.h
|
|
BKE_key.h
|
|
BKE_lamp.h
|
|
BKE_lattice.h
|
|
BKE_library.h
|
|
BKE_linestyle.h
|
|
BKE_main.h
|
|
BKE_mask.h
|
|
BKE_material.h
|
|
BKE_mball.h
|
|
BKE_mesh.h
|
|
BKE_modifier.h
|
|
BKE_movieclip.h
|
|
BKE_multires.h
|
|
BKE_nla.h
|
|
BKE_node.h
|
|
BKE_object.h
|
|
BKE_object_deform.h
|
|
BKE_ocean.h
|
|
BKE_packedFile.h
|
|
BKE_paint.h
|
|
BKE_particle.h
|
|
BKE_pbvh.h
|
|
BKE_pointcache.h
|
|
BKE_property.h
|
|
BKE_report.h
|
|
BKE_rigidbody.h
|
|
BKE_sca.h
|
|
BKE_scene.h
|
|
BKE_screen.h
|
|
BKE_sequencer.h
|
|
BKE_shrinkwrap.h
|
|
BKE_sketch.h
|
|
BKE_smoke.h
|
|
BKE_softbody.h
|
|
BKE_sound.h
|
|
BKE_speaker.h
|
|
BKE_subsurf.h
|
|
BKE_suggestions.h
|
|
BKE_editmesh.h
|
|
BKE_editmesh_bvh.h
|
|
BKE_text.h
|
|
BKE_texture.h
|
|
BKE_tracking.h
|
|
BKE_treehash.h
|
|
BKE_unit.h
|
|
BKE_utildefines.h
|
|
BKE_world.h
|
|
BKE_writeavi.h
|
|
BKE_writeframeserver.h
|
|
|
|
depsgraph_private.h
|
|
nla_private.h
|
|
intern/CCGSubSurf.h
|
|
intern/pbvh_intern.h
|
|
)
|
|
|
|
add_definitions(-DGLEW_STATIC)
|
|
|
|
if(WITH_AUDASPACE)
|
|
list(APPEND INC
|
|
../../../intern/audaspace/intern
|
|
)
|
|
add_definitions(-DWITH_AUDASPACE)
|
|
endif()
|
|
|
|
if(WITH_BULLET)
|
|
list(APPEND INC_SYS
|
|
${BULLET_INCLUDE_DIRS}
|
|
)
|
|
list(APPEND INC
|
|
../../../intern/rigidbody
|
|
)
|
|
add_definitions(-DWITH_BULLET)
|
|
endif()
|
|
|
|
#if(WITH_MOD_CLOTH_ELTOPO)
|
|
# list(APPEND INC
|
|
# ../../../extern/eltopo
|
|
# ../../../extern/eltopo/eltopo3d
|
|
# )
|
|
# add_definitions(-DWITH_ELTOPO)
|
|
#endif()
|
|
|
|
if(WITH_IMAGE_OPENEXR)
|
|
add_definitions(-DWITH_OPENEXR)
|
|
endif()
|
|
|
|
if(WITH_IMAGE_TIFF)
|
|
add_definitions(-DWITH_TIFF)
|
|
endif()
|
|
|
|
if(WITH_IMAGE_OPENJPEG)
|
|
add_definitions(-DWITH_OPENJPEG)
|
|
endif()
|
|
|
|
if(WITH_IMAGE_DDS)
|
|
add_definitions(-DWITH_DDS)
|
|
endif()
|
|
|
|
if(WITH_IMAGE_CINEON)
|
|
add_definitions(-DWITH_CINEON)
|
|
endif()
|
|
|
|
if(WITH_IMAGE_FRAMESERVER)
|
|
add_definitions(-DWITH_FRAMESERVER)
|
|
endif()
|
|
|
|
if(WITH_IMAGE_HDR)
|
|
add_definitions(-DWITH_HDR)
|
|
endif()
|
|
|
|
if(WITH_CODEC_AVI)
|
|
list(APPEND INC
|
|
../avi
|
|
)
|
|
add_definitions(-DWITH_AVI)
|
|
endif()
|
|
|
|
if(WITH_CODEC_QUICKTIME)
|
|
list(APPEND INC
|
|
../quicktime
|
|
)
|
|
list(APPEND INC_SYS
|
|
${QUICKTIME_INCLUDE_DIRS}
|
|
)
|
|
add_definitions(-DWITH_QUICKTIME)
|
|
endif()
|
|
|
|
if(WITH_CODEC_FFMPEG)
|
|
list(APPEND SRC
|
|
intern/writeffmpeg.c
|
|
BKE_writeffmpeg.h
|
|
)
|
|
list(APPEND INC
|
|
../../../intern/ffmpeg
|
|
)
|
|
list(APPEND INC_SYS
|
|
${FFMPEG_INCLUDE_DIRS}
|
|
)
|
|
add_definitions(-DWITH_FFMPEG)
|
|
|
|
remove_strict_flags_file(
|
|
intern/writeffmpeg.c
|
|
)
|
|
endif()
|
|
|
|
if(WITH_PYTHON)
|
|
list(APPEND INC
|
|
../python
|
|
)
|
|
add_definitions(-DWITH_PYTHON)
|
|
|
|
if(WITH_PYTHON_SECURITY)
|
|
add_definitions(-DWITH_PYTHON_SECURITY)
|
|
endif()
|
|
endif()
|
|
|
|
if(WITH_MOD_FLUID)
|
|
list(APPEND INC
|
|
../../../intern/elbeem/extern
|
|
)
|
|
add_definitions(-DWITH_MOD_FLUID)
|
|
endif()
|
|
|
|
if(WITH_MOD_SMOKE)
|
|
add_definitions(-DWITH_SMOKE)
|
|
endif()
|
|
|
|
if(WITH_MOD_OCEANSIM)
|
|
add_definitions(-DWITH_OCEANSIM)
|
|
endif()
|
|
|
|
if(WITH_MOD_BOOLEAN)
|
|
list(APPEND INC
|
|
../../../intern/bsp/extern
|
|
)
|
|
endif()
|
|
|
|
if(WITH_JACK)
|
|
add_definitions(-DWITH_JACK)
|
|
endif()
|
|
|
|
if(WITH_LZO)
|
|
list(APPEND INC_SYS
|
|
../../../extern/lzo/minilzo
|
|
)
|
|
add_definitions(-DWITH_LZO)
|
|
endif()
|
|
|
|
if(WITH_LZMA)
|
|
list(APPEND INC_SYS
|
|
../../../extern/lzma
|
|
)
|
|
add_definitions(-DWITH_LZMA)
|
|
endif()
|
|
|
|
if(WITH_GAMEENGINE)
|
|
list(APPEND INC_SYS
|
|
../../../extern/recastnavigation
|
|
)
|
|
list(APPEND SRC
|
|
intern/navmesh_conversion.c
|
|
BKE_navmesh_conversion.h
|
|
)
|
|
|
|
add_definitions(-DWITH_GAMEENGINE)
|
|
endif()
|
|
|
|
if(WITH_LIBMV)
|
|
add_definitions(-DWITH_LIBMV)
|
|
endif()
|
|
|
|
if(WITH_FFTW3)
|
|
list(APPEND INC_SYS
|
|
${FFTW3_INCLUDE_DIRS}
|
|
)
|
|
add_definitions(-DFFTW3=1)
|
|
endif()
|
|
|
|
if(WITH_INTERNATIONAL)
|
|
add_definitions(-DWITH_INTERNATIONAL)
|
|
endif()
|
|
|
|
if(WITH_FREESTYLE)
|
|
add_definitions(-DWITH_FREESTYLE)
|
|
endif()
|
|
|
|
## Warnings as errors, this is too strict!
|
|
#if(MSVC)
|
|
# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
|
|
#endif()
|
|
|
|
blender_add_lib(bf_blenkernel "${SRC}" "${INC}" "${INC_SYS}")
|