Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-05-22 08:49:24 +02:00
parent 4e14437cb0 28c20fc393
commit bb45381bc2
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/guardedalloc/intern/mallocn_lockfree_impl.c
View File

@@ -171,7 +171,7 @@ void *MEM_lockfree_dupallocN(const void *vmemh)
void *newp = NULL; void *newp = NULL;
if (vmemh) { if (vmemh) {
MemHead *memh = MEMHEAD_FROM_PTR(vmemh); MemHead *memh = MEMHEAD_FROM_PTR(vmemh);
const size_t prev_size = MEM_allocN_len(vmemh); const size_t prev_size = MEM_lockfree_allocN_len(vmemh);
if (UNLIKELY(MEMHEAD_IS_MMAP(memh))) { if (UNLIKELY(MEMHEAD_IS_MMAP(memh))) {
newp = MEM_lockfree_mapallocN(prev_size, "dupli_mapalloc"); newp = MEM_lockfree_mapallocN(prev_size, "dupli_mapalloc");
} }
@@ -196,7 +196,7 @@ void *MEM_lockfree_reallocN_id(void *vmemh, size_t len, const char *str)
if (vmemh) { if (vmemh) {
MemHead *memh = MEMHEAD_FROM_PTR(vmemh); MemHead *memh = MEMHEAD_FROM_PTR(vmemh);
size_t old_len = MEM_allocN_len(vmemh); size_t old_len = MEM_lockfree_allocN_len(vmemh);
if (LIKELY(!MEMHEAD_IS_ALIGNED(memh))) { if (LIKELY(!MEMHEAD_IS_ALIGNED(memh))) {
newp = MEM_lockfree_mallocN(len, "realloc"); newp = MEM_lockfree_mallocN(len, "realloc");
@@ -235,7 +235,7 @@ void *MEM_lockfree_recallocN_id(void *vmemh, size_t len, const char *str)
if (vmemh) { if (vmemh) {
MemHead *memh = MEMHEAD_FROM_PTR(vmemh); MemHead *memh = MEMHEAD_FROM_PTR(vmemh);
size_t old_len = MEM_allocN_len(vmemh); size_t old_len = MEM_lockfree_allocN_len(vmemh);
if (LIKELY(!MEMHEAD_IS_ALIGNED(memh))) { if (LIKELY(!MEMHEAD_IS_ALIGNED(memh))) {
newp = MEM_lockfree_mallocN(len, "recalloc"); newp = MEM_lockfree_mallocN(len, "recalloc");

21
source/creator/CMakeLists.txt
View File

@@ -259,15 +259,30 @@ endif()
set(BLENDER_TEXT_FILES set(BLENDER_TEXT_FILES
${CMAKE_SOURCE_DIR}/release/text/GPL-license.txt ${CMAKE_SOURCE_DIR}/release/text/GPL-license.txt
${CMAKE_SOURCE_DIR}/release/text/GPL3-license.txt ${CMAKE_SOURCE_DIR}/release/text/GPL3-license.txt
${CMAKE_SOURCE_DIR}/release/text/Python-license.txt
${CMAKE_SOURCE_DIR}/release/text/copyright.txt ${CMAKE_SOURCE_DIR}/release/text/copyright.txt
${CMAKE_SOURCE_DIR}/release/text/jemalloc-license.txt
${CMAKE_SOURCE_DIR}/release/text/ocio-license.txt
# generate this file # generate this file
# ${CMAKE_SOURCE_DIR}/release/text/readme.html # ${CMAKE_SOURCE_DIR}/release/text/readme.html
${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-bfont.ttf.txt ${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-bfont.ttf.txt
) )
if(WITH_PYTHON)
list(APPEND BLENDER_TEXT_FILES
${CMAKE_SOURCE_DIR}/release/text/Python-license.txt
)
endif()
if(WITH_OPENCOLORIO)
list(APPEND BLENDER_TEXT_FILES
${CMAKE_SOURCE_DIR}/release/text/ocio-license.txt
)
endif()
if(WITH_MEM_JEMALLOC)
list(APPEND BLENDER_TEXT_FILES
${CMAKE_SOURCE_DIR}/release/text/jemalloc-license.txt
)
endif()
if(WITH_INTERNATIONAL) if(WITH_INTERNATIONAL)
list(APPEND BLENDER_TEXT_FILES list(APPEND BLENDER_TEXT_FILES
${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-droidsans.ttf.txt ${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-droidsans.ttf.txt