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

svn merge -r 31211:31313 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Browse Source
This commit is contained in:
Joerg Mueller
2010-08-13 10:50:29 +00:00
parent fd2a9a0ed0 9ce2086506
commit 47d38dbd20
235 changed files with 2201 additions and 1939 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/gameengine/Ketsji/KX_PythonInit.cpp
View File

@@ -122,7 +122,7 @@ extern "C" {
#include "KX_BlenderSceneConverter.h"
#include "KX_MeshProxy.h" /* for creating a new library of mesh objects */
extern "C" {
#include "BLO_readfile.h"
#include "BKE_idcode.h"
}
#include "NG_NetworkScene.h" //Needed for sendMessage()
@@ -661,7 +661,7 @@ static PyObject *gLibNew(PyObject*, PyObject* args)
return NULL;
}
idcode= BLO_idcode_from_name(group);
idcode= BKE_idcode_from_name(group);
if(idcode==0) {
PyErr_Format(PyExc_ValueError, "invalid group given \"%s\"", group);
return NULL;