archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merged changes in the trunk up to revision 48893.

Browse Source 
Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_filter.c
source/blender/makesrna/RNA_enum_types.h
This commit is contained in:
Tamito Kajiyama
2012-07-13 23:23:06 +00:00
parent b7b5029814 807ad1f0e0
commit 065605e0da
621 changed files with 11525 additions and 6470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/python/intern/bpy_interface.c
View File

@@ -303,7 +303,7 @@ void BPY_python_end(void)
PyGILState_Ensure(); /* finalizing, no need to grab the state */
// free other python data.
/* free other python data. */
pyrna_free_types();
/* clear all python data from structs */
@@ -317,7 +317,7 @@ void BPY_python_end(void)
Py_Finalize();
#ifdef TIME_PY_RUN
// measure time since py started
/* measure time since py started */
bpy_timer = PIL_check_seconds_timer() - bpy_timer;
printf("*bpy stats* - ");

12
source/blender/python/intern/bpy_library.c
View File

@@ -39,6 +39,12 @@
#include "BLO_readfile.h"
#include "BLI_utildefines.h"
#include "BLI_string.h"
#include "BLI_linklist.h"
#include "BLI_path_util.h"
#include "BLI_listbase.h"
#include "BKE_global.h"
#include "BKE_main.h"
#include "BKE_library.h"
@@ -46,12 +52,6 @@
#include "BKE_report.h"
#include "BKE_context.h"
#include "BLI_utildefines.h"
#include "BLI_string.h"
#include "BLI_linklist.h"
#include "BLI_path_util.h"
#include "BLI_listbase.h"
#include "DNA_space_types.h" /* FILE_LINK, FILE_RELPATH */
#include "bpy_util.h"

2
source/blender/python/intern/bpy_rna.c
View File

@@ -4267,7 +4267,7 @@ static int foreach_parse_args(BPy_PropertyRNA *self, PyObject *args,
return -1;
}
*tot = PySequence_Size(*seq); // TODO - buffer may not be a sequence! array.array() is tho.
*tot = PySequence_Size(*seq); /* TODO - buffer may not be a sequence! array.array() is tho. */
if (*tot > 0) {
foreach_attr_type(self, *attr, raw_type, attr_tot, attr_signed);

6
source/blender/python/intern/gpu.c
View File

@@ -83,7 +83,7 @@ PyInit_gpu(void)
if (m == NULL)
return NULL;
// device constants
/* device constants */
PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_OBJECT_VIEWMAT);
PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_OBJECT_MAT);
PY_MODULE_ADD_CONSTANT(m, GPU_DYNAMIC_OBJECT_VIEWIMAT);
@@ -187,13 +187,13 @@ static PyObject *GPU_export_shader(PyObject *UNUSED(self), PyObject *args, PyObj
return NULL;
}
// we can call our internal function at last:
/* we can call our internal function at last: */
shader = GPU_shader_export(scene, material);
if (!shader) {
PyErr_SetString(PyExc_RuntimeError, "cannot export shader");
return NULL;
}
// build a dictionary
/* build a dictionary */
result = PyDict_New();
if (shader->fragment) {
PY_DICT_ADD_STRING(result, shader, fragment);