diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-01-03 04:23:17 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-03 04:25:37 +0300 |
commit | ba9e10fd6a5b7052d25f34343b7b723d25a94490 (patch) | |
tree | f9b45841dbbcc40c9c2e0b40f9d69d572589adc5 /source/blender/blenkernel/intern/material.c | |
parent | 11f2c65128dc9bdead56003df7c282b6e091cbd1 (diff) | |
parent | 847b21ee08e5a30a2fe35ede4c5b3a73af404af7 (diff) |
Merge branch 'blender2.7'
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
-rw-r--r-- | source/blender/blenkernel/intern/material.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 30fc02e94de..7e59d31571b 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -512,9 +512,9 @@ void BKE_material_clear_id(Main *bmain, ID *id, bool update_data) } } -Material *give_current_material(Object *ob, short act) +Material **give_current_material_p(Object *ob, short act) { - Material ***matarar, *ma; + Material ***matarar, **ma_p; const short *totcolp; if (ob == NULL) return NULL; @@ -534,7 +534,7 @@ Material *give_current_material(Object *ob, short act) } if (ob->matbits && ob->matbits[act - 1]) { /* in object */ - ma = ob->mat[act - 1]; + ma_p = &ob->mat[act - 1]; } else { /* in data */ @@ -545,12 +545,21 @@ Material *give_current_material(Object *ob, short act) matarar = give_matarar(ob); - if (matarar && *matarar) ma = (*matarar)[act - 1]; - else ma = NULL; - + if (matarar && *matarar) { + ma_p = &(*matarar)[act - 1]; + } + else { + ma_p = NULL; + } } - return ma; + return ma_p; +} + +Material *give_current_material(Object *ob, short act) +{ + Material **ma_p = give_current_material_p(ob, act); + return ma_p ? *ma_p : NULL; } MaterialGPencilStyle *BKE_material_gpencil_settings_get(Object *ob, short act) |