blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Merge branch 'blender-v3.4-release'

This commit is contained in:
Bastien Montagne 2022-11-15 12:44:39 +01:00
parent 84dce9c1fa a968f1b9b3
commit 66939d47b1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build_files/build_environment/install_deps.sh
View File

@ -602,9 +602,9 @@ LEVEL_ZERO_FORCE_BUILD=false
LEVEL_ZERO_FORCE_REBUILD=false
LEVEL_ZERO_SKIP=false
OPENPGL_VERSION="0.4.0"
OPENPGL_VERSION="0.4.1"
OPENPGL_VERSION_SHORT="0.4"
OPENPGL_VERSION_MIN="0.3.1"
OPENPGL_VERSION_MIN="0.4.1"
OPENPGL_VERSION_MEX="0.5"
OPENPGL_FORCE_BUILD=false
OPENPGL_FORCE_REBUILD=false

2
source/blender/blenloader/intern/readfile.cc
View File

@ -3111,7 +3111,7 @@ static BHead *read_data_into_datamap(FileData *fd, BHead *bhead, const char *all
SDNA_Struct *sp = fd->filesdna->structs[bhead->SDNAnr];
allocname = fd->filesdna->types[sp->type];
size_t allocname_size = strlen(allocname) + 1;
char *allocname_buf = malloc(allocname_size);
char *allocname_buf = static_cast<char *>(malloc(allocname_size));
memcpy(allocname_buf, allocname, allocname_size);
allocname = allocname_buf;
}