diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-29 16:59:18 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-29 17:02:53 +0300 |
commit | 8f670dd855b1d81fcf619b3b94ba4bfaf51e896d (patch) | |
tree | 681c0dabf0af6e17ead533d174fde08e55e9cd0f /source/blender/makesrna/intern/rna_ID.c | |
parent | 9d037153f70c9bcc665fffa4971d1517044dbf29 (diff) | |
parent | f7af08b5feecd89ea32c8905de1e61d575ff4bf1 (diff) |
Merge branch 'master' into blender2.8
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
Diffstat (limited to 'source/blender/makesrna/intern/rna_ID.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_ID.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index 1ea452bf389..32407b26003 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -456,7 +456,7 @@ int rna_IDMaterials_assign_int(PointerRNA *ptr, int key, const PointerRNA *assig short *totcol = give_totcolp_id(id); Material *mat_id = assign_ptr->id.data; if (totcol && (key >= 0 && key < *totcol)) { - assign_material_id(id, mat_id, key + 1); + assign_material_id(G.main, id, mat_id, key + 1); return 1; } else { |