AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated RetroCommon

This commit is contained in:
Jack Andersen 2015-08-07 18:52:20 -10:00
parent 669c598f4b
commit ef76839965
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hecl/blender/BlenderConnection.cpp
View File

@ -33,7 +33,7 @@ size_t BlenderConnection::_readLine(char* buf, size_t bufSz)
{ {
if (readBytes >= bufSz) if (readBytes >= bufSz)
{ {
BlenderLog.report(LogVisor::FatalError, "Pipe buffer overrun\n"); BlenderLog.report(LogVisor::FatalError, "Pipe buffer overrun");
*(buf-1) = '\0'; *(buf-1) = '\0';
return bufSz - 1; return bufSz - 1;
} }
@ -383,7 +383,7 @@ void BlenderConnection::PyOutStream::linkBlend(const SystemString& target, const
bool link) bool link)
{ {
format("if '%s' not in bpy.data.scenes:\n" format("if '%s' not in bpy.data.scenes:\n"
" with bpy.data.libraries.load('%s', link=%s, relative=True) as (data_from, data_to):\n" " with bpy.data.libraries.load('''%s''', link=%s, relative=True) as (data_from, data_to):\n"
" data_to.scenes = data_from.scenes\n" " data_to.scenes = data_from.scenes\n"
" obj_scene = None\n" " obj_scene = None\n"
" for scene in data_to.scenes:\n" " for scene in data_to.scenes:\n"
@ -402,9 +402,9 @@ void BlenderConnection::PyOutStream::linkBlend(const SystemString& target, const
} }
bool BlenderConnection::cookBlend(std::function<char*(uint32_t)> bufGetter, bool BlenderConnection::cookBlend(std::function<char*(uint32_t)> bufGetter,
const std::string& expectedType, const std::string& expectedType,
const std::string& platform, const std::string& platform,
bool bigEndian) bool bigEndian)
{ {
char lineBuf[256]; char lineBuf[256];
char reqLine[512]; char reqLine[512];

2
hecl/extern/RetroCommon vendored

@ -1 +1 @@
Subproject commit 592c4484e705cf58d15d0b62931df6845b1fcc86 Subproject commit 161a583646be6f0c66f1b958b8d0dcbf9bc27ac3