Merged changes in the trunk up to revision 49986.

2012-08-18 15:20:35 +00:00
parent 44e4c5f831 e982e9b04f
commit 22b30da565
346 changed files with 4092 additions and 76123 deletions
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@ -141,6 +141,7 @@ Object *rna_Main_objects_new(Main *UNUSED(bmain), ReportList *reports, const cha
 	Object *ob;
 	int type = OB_EMPTY;
 	if (data) {
+		/* keep in sync with OB_DATA_SUPPORT_ID() macro */
 		switch (GS(data->name)) {
 			case ID_ME:
 				type = OB_MESH;