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

Merged changes in the trunk up to revision 55546.

Browse Source 
Conflicts resolved:
source/blenderplayer/bad_level_call_stubs/SConscript

Partly reverted changes to intern/cycles/blender/addon/ui.py in revision 52899
to make it easier to merge trunk changes.
This commit is contained in:
Tamito Kajiyama
2013-03-24 12:13:13 +00:00
parent 5841d1c814 b5ce1b1a23
commit 385c72f5f2
379 changed files with 6689 additions and 5533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,7 +189,7 @@ int pyrna_set_to_enum_bitfield(EnumPropertyItem *items, PyObject *value, int *r_
int pyrna_enum_value_from_id(EnumPropertyItem *item, const char *identifier, int *value, const char *error_prefix);
int pyrna_deferred_register_class(struct StructRNA *srna, PyObject *py_class);
int pyrna_deferred_register_class(struct StructRNA *srna, PyTypeObject *py_class);
/* called before stopping python */
void pyrna_alloc_types(void);