diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-02-05 13:23:58 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2020-02-05 17:56:50 +0300 |
| commit | 1bc2a98a9d609e54c928672f148edfba9d5f8c5a (patch) | |
| tree | 0884042019d5c886348e643d30744b4bdcf5a60f /source/blender/editors/gpencil/gpencil_merge.c | |
| parent | 06c560864607562acdc1e61b13369f24b22c102c (diff) | |
T73589: Code Quality: Renaming on BKE_material.h
Old Name New Name
========= =========
init_def_material BKE_materials_init
BKE_material_gpencil_default_free BKE_materials_exit
test_object_materials BKE_object_materials_test
test_all_objects_materials BKE_objects_materials_test_all
give_matarar BKE_object_material_array
give_totcolp BKE_object_material_num
give_current_material_p BKE_object_material_get_p
give_current_material BKE_object_material_get
assign_material BKE_object_material_assign
assign_matarar BKE_object_material_array_assign
give_matarar_id BKE_id_material_array
give_totcolp_id BKE_id_material_num
assign_material_id BKE_id_material_assign
clear_matcopybuf BKE_material_copybuf_clear
free_matcopybuf BKE_material_copybuf_free
copy_matcopybuf BKE_material_copybuf_copy
paste_matcopybuf BKE_material_copybuf_paste
BKE_material_init_gpencil_settings BKE_gpencil_material_attr_init
BKE_material_add_gpencil BKE_gpencil_material_add
BKE_material_gpencil_get BKE_gpencil_material
BKE_material_gpencil_default_get BKE_gpencil_material_default
BKE_material_gpencil_settings_get BKE_gpencil_material_settings
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_merge.c')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/gpencil/gpencil_merge.c b/source/blender/editors/gpencil/gpencil_merge.c index 36cef3ccdc0..91339709162 100644 --- a/source/blender/editors/gpencil/gpencil_merge.c +++ b/source/blender/editors/gpencil/gpencil_merge.c @@ -451,7 +451,7 @@ static bool gp_strokes_merge_poll(bContext *C) /* check material */ Material *ma = NULL; - ma = BKE_material_gpencil_get(ob, ob->actcol); + ma = BKE_gpencil_material(ob, ob->actcol); if ((ma == NULL) || (ma->gp_style == NULL)) { return false; } |