diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2018-06-05 23:23:35 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2018-06-05 23:23:35 +0300 |
commit | 1aae5ac1a8ef63d954f85ad2425c07e648de722a (patch) | |
tree | 8d6f585a5e5a669893f9cf8938713fe0b4a0eea4 /source/blender/blenkernel/intern/material.c | |
parent | e44b3bf7b8480a51ad7a80e9e30e8396cd992f6f (diff) | |
parent | b28c35daef4a39d6bfa53af702bd66006ee9c7f1 (diff) |
Merge branch 'hair_guides' into hair_guides_grooming
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
-rw-r--r-- | source/blender/blenkernel/intern/material.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 28963cd8380..854ddb47185 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -114,10 +114,10 @@ void BKE_material_init(Material *ma) ma->r = ma->g = ma->b = 0.8; ma->specr = ma->specg = ma->specb = 1.0; - ma->alpha = 1.0; + // ma->alpha = 1.0; /* DEPRECATED */ ma->spec = 0.5; - ma->gloss_mir = 1.0; + ma->roughness = 0.25f; ma->pr_lamp = 3; /* two lamps, is bits */ ma->pr_type = MA_SPHERE; @@ -415,7 +415,7 @@ Material *BKE_material_pop_id(Main *bmain, ID *id, int index_i, bool update_data (*totcol)--; *matar = MEM_reallocN(*matar, sizeof(void *) * (*totcol)); - test_all_objects_materials(G.main, id); + test_all_objects_materials(bmain, id); } if (update_data) { @@ -548,7 +548,7 @@ void BKE_material_resize_object(Main *bmain, Object *ob, const short totcol, boo DEG_relations_tag_update(bmain); } -void test_object_materials(Object *ob, ID *id) +void test_object_materials(Main *bmain, Object *ob, ID *id) { /* make the ob mat-array same size as 'ob->data' mat-array */ const short *totcol; @@ -557,7 +557,7 @@ void test_object_materials(Object *ob, ID *id) return; } - BKE_material_resize_object(G.main, ob, *totcol, false); + BKE_material_resize_object(bmain, ob, *totcol, false); } void test_all_objects_materials(Main *bmain, ID *id) @@ -579,7 +579,7 @@ void test_all_objects_materials(Main *bmain, ID *id) BKE_main_unlock(bmain); } -void assign_material_id(ID *id, Material *ma, short act) +void assign_material_id(Main *bmain, ID *id, Material *ma, short act) { Material *mao, **matar, ***matarar; short *totcolp; @@ -623,10 +623,10 @@ void assign_material_id(ID *id, Material *ma, short act) if (ma) id_us_plus(&ma->id); - test_all_objects_materials(G.main, id); + test_all_objects_materials(bmain, id); } -void assign_material(Object *ob, Material *ma, short act, int assign_type) +void assign_material(Main *bmain, Object *ob, Material *ma, short act, int assign_type) { Material *mao, **matar, ***matarar; short *totcolp; @@ -698,14 +698,14 @@ void assign_material(Object *ob, Material *ma, short act, int assign_type) if (mao) id_us_min(&mao->id); ob->mat[act - 1] = ma; - test_object_materials(ob, ob->data); + test_object_materials(bmain, ob, ob->data); } else { /* in data */ mao = (*matarar)[act - 1]; if (mao) id_us_min(&mao->id); (*matarar)[act - 1] = ma; - test_all_objects_materials(G.main, ob->data); /* Data may be used by several objects... */ + test_all_objects_materials(bmain, ob->data); /* Data may be used by several objects... */ } if (ma) @@ -798,20 +798,20 @@ void BKE_material_remap_object_calc( /* XXX - this calls many more update calls per object then are needed, could be optimized */ -void assign_matarar(struct Object *ob, struct Material ***matar, short totcol) +void assign_matarar(Main *bmain, struct Object *ob, struct Material ***matar, short totcol) { int actcol_orig = ob->actcol; short i; while ((ob->totcol > totcol) && - BKE_object_material_slot_remove(ob)) + BKE_object_material_slot_remove(bmain, ob)) { /* pass */ } /* now we have the right number of slots */ for (i = 0; i < totcol; i++) - assign_material(ob, (*matar)[i], i + 1, BKE_MAT_ASSIGN_USERPREF); + assign_material(bmain, ob, (*matar)[i], i + 1, BKE_MAT_ASSIGN_USERPREF); if (actcol_orig > ob->totcol) actcol_orig = ob->totcol; @@ -840,19 +840,19 @@ short BKE_object_material_slot_find_index(Object *ob, Material *ma) return 0; } -bool BKE_object_material_slot_add(Object *ob) +bool BKE_object_material_slot_add(Main *bmain, Object *ob) { if (ob == NULL) return false; if (ob->totcol >= MAXMAT) return false; - assign_material(ob, NULL, ob->totcol + 1, BKE_MAT_ASSIGN_USERPREF); + assign_material(bmain, ob, NULL, ob->totcol + 1, BKE_MAT_ASSIGN_USERPREF); ob->actcol = ob->totcol; return true; } /* ****************** */ -bool BKE_object_material_slot_remove(Object *ob) +bool BKE_object_material_slot_remove(Main *bmain, Object *ob) { Material *mao, ***matarar; short *totcolp; @@ -903,7 +903,7 @@ bool BKE_object_material_slot_remove(Object *ob) actcol = ob->actcol; - for (Object *obt = G.main->object.first; obt; obt = obt->id.next) { + for (Object *obt = bmain->object.first; obt; obt = obt->id.next) { if (obt->data == ob->data) { /* Can happen when object material lists are used, see: T52953 */ if (actcol > obt->totcol) { @@ -1289,21 +1289,21 @@ void free_matcopybuf(void) matcopied = 0; } -void copy_matcopybuf(Material *ma) +void copy_matcopybuf(Main *bmain, Material *ma) { if (matcopied) free_matcopybuf(); memcpy(&matcopybuf, ma, sizeof(Material)); - matcopybuf.nodetree = ntreeCopyTree_ex(ma->nodetree, G.main, false); + matcopybuf.nodetree = ntreeCopyTree_ex(ma->nodetree, bmain, false); matcopybuf.preview = NULL; BLI_listbase_clear(&matcopybuf.gpumaterial); /* TODO Duplicate Engine Settings and set runtime to NULL */ matcopied = 1; } -void paste_matcopybuf(Material *ma) +void paste_matcopybuf(Main *bmain, Material *ma) { ID id; @@ -1322,7 +1322,7 @@ void paste_matcopybuf(Material *ma) memcpy(ma, &matcopybuf, sizeof(Material)); (ma->id) = id; - ma->nodetree = ntreeCopyTree_ex(matcopybuf.nodetree, G.main, false); + ma->nodetree = ntreeCopyTree_ex(matcopybuf.nodetree, bmain, false); } void BKE_material_eval(struct Depsgraph *depsgraph, Material *material) |