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

Merge branch 'master' into blender2.8

Browse Source 
Conflicts:
	source/blender/blenkernel/BKE_material.h
	source/blender/blenkernel/BKE_mesh.h
	source/blender/blenkernel/intern/library_remap.c
	source/blender/blenkernel/intern/material.c
	source/blender/editors/object/object_relations.c
	source/blender/editors/render/render_preview.c
	source/blender/makesrna/intern/rna_object.c
This commit is contained in:
Bastien Montagne
2018-05-29 15:59:18 +02:00
parent 9d037153f7 f7af08b5fe
commit 8f670dd855
17 changed files with 61 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/makesrna/intern/rna_main_api.c
View File

@@ -251,7 +251,7 @@ static Object *rna_Main_objects_new(Main *bmain, ReportList *reports, const char
ob = BKE_object_add_only_object(bmain, type, safe_name);
ob->data = data;
test_object_materials(ob, ob->data);
test_object_materials(bmain, ob, ob->data);
return ob;
}