TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 09:23:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix faulty merge

Browse Source
This commit is contained in:
rdb 2016-12-26 17:36:11 +01:00
parent 9c789db918
commit fb2568afad
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/ReleaseNotes
View File

@ -54,6 +54,7 @@ This issue fixes several bugs that were still found in 1.9.2.
* Now also compiles on older Linux distros (eg. CentOS 5 / manylinux1) * Now also compiles on older Linux distros (eg. CentOS 5 / manylinux1)
* get_keyboard_map now includes keys on layouts with special characters * get_keyboard_map now includes keys on layouts with special characters
* Fix crash due to incorrect alignment when compiling Eigen with AVX * Fix crash due to incorrect alignment when compiling Eigen with AVX
* Fix crash when writing 16-bit .tif file (now silently downsamples)
------------------------ RELEASE 1.9.2 ------------------------ ------------------------ RELEASE 1.9.2 ------------------------
@ -78,7 +79,6 @@ remained in the 1.9.1 release, including:
* Fix constant reloading of texture when gl-ignore-mipmaps is set * Fix constant reloading of texture when gl-ignore-mipmaps is set
* BamReader now releases the GIL (so it can be used threaded) * BamReader now releases the GIL (so it can be used threaded)
* Fix AttributeError in direct.stdpy.threading module * Fix AttributeError in direct.stdpy.threading module
* Fix crash when writing 16-bit .tif file (now silently downsamples)
------------------------ RELEASE 1.9.1 ------------------------ ------------------------ RELEASE 1.9.1 ------------------------

5
dtool/src/dtoolbase/memoryHook.I
View File

@ -70,12 +70,11 @@ get_header_reserved_bytes() {
#ifdef LINMATH_ALIGN #ifdef LINMATH_ALIGN
// If we're doing SSE2 alignment, we must reserve a full 16-byte block, // If we're doing SSE2 alignment, we must reserve a full 16-byte block,
// since anything less than that will spoil the alignment. // since anything less than that will spoil the alignment.
static const size_t header_reserved_bytes = 16;
#ifdef __AVX__ #ifdef __AVX__
// Eigen requires 32-byte alignment when using AVX instructions. // Eigen requires 32-byte alignment when using AVX instructions.
const size_t header_reserved_bytes = 32; static const size_t header_reserved_bytes = 32;
#else #else
const size_t header_reserved_bytes = 16; static const size_t header_reserved_bytes = 16;
#endif #endif
#elif defined(MEMORY_HOOK_DO_ALIGN) #elif defined(MEMORY_HOOK_DO_ALIGN)