Commit: 5314efc4cc12955d64c6a84c4e30346e49a3ab14 Author: Antonio Vazquez Date: Wed Feb 5 11:23:58 2020 +0100 Branches: greasepencil-object https://developer.blender.org/rB5314efc4cc12955d64c6a84c4e30346e49a3ab14
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 =================================================================== M source/blender/alembic/intern/abc_mesh.cc M source/blender/blenkernel/BKE_material.h M source/blender/blenkernel/intern/brush.c M source/blender/blenkernel/intern/gpencil.c M source/blender/blenkernel/intern/gpencil_modifier.c M source/blender/blenkernel/intern/library_remap.c M source/blender/blenkernel/intern/material.c M source/blender/blenkernel/intern/mesh.c M source/blender/blenkernel/intern/mesh_convert.c M source/blender/blenkernel/intern/object.c M source/blender/blenkernel/intern/particle.c M source/blender/blenkernel/intern/particle_system.c M source/blender/blenloader/intern/readfile.c M source/blender/collada/AnimationExporter.cpp M source/blender/collada/AnimationImporter.cpp M source/blender/collada/BCAnimationCurve.cpp M source/blender/collada/BCAnimationSampler.cpp M source/blender/collada/EffectExporter.cpp M source/blender/collada/GeometryExporter.cpp M source/blender/collada/InstanceWriter.cpp M source/blender/collada/MaterialExporter.cpp M source/blender/collada/MaterialExporter.h M source/blender/collada/MeshImporter.cpp M source/blender/collada/collada_utils.cpp M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc M source/blender/depsgraph/intern/builder/deg_builder_relations.cc M source/blender/draw/engines/eevee/eevee_materials.c M source/blender/draw/engines/eevee/eevee_volumes.c M source/blender/draw/engines/gpencil/gpencil_draw_utils.c M source/blender/draw/engines/gpencil/gpencil_engine.c M source/blender/draw/engines/overlay/overlay_extra.c M source/blender/draw/engines/overlay/overlay_particle.c M source/blender/draw/engines/workbench/workbench_deferred.c M source/blender/draw/engines/workbench/workbench_forward.c M source/blender/draw/engines/workbench/workbench_materials.c M source/blender/editors/animation/anim_filter.c M source/blender/editors/animation/keyframing.c M source/blender/editors/gpencil/drawgpencil.c M source/blender/editors/gpencil/gpencil_add_monkey.c M source/blender/editors/gpencil/gpencil_add_stroke.c M source/blender/editors/gpencil/gpencil_data.c M source/blender/editors/gpencil/gpencil_edit.c M source/blender/editors/gpencil/gpencil_fill.c M source/blender/editors/gpencil/gpencil_merge.c M source/blender/editors/gpencil/gpencil_utils.c M source/blender/editors/interface/interface_eyedropper_gpencil_color.c M source/blender/editors/mesh/editmesh_select_similar.c M source/blender/editors/mesh/editmesh_tools.c M source/blender/editors/mesh/meshtools.c M source/blender/editors/object/object_add.c M source/blender/editors/object/object_bake_api.c M source/blender/editors/object/object_relations.c M source/blender/editors/object/object_select.c M source/blender/editors/render/render_preview.c M source/blender/editors/render/render_shading.c M source/blender/editors/sculpt_paint/paint_image.c M source/blender/editors/sculpt_paint/paint_image_proj.c M source/blender/editors/sculpt_paint/paint_utils.c M source/blender/editors/space_buttons/buttons_context.c M source/blender/editors/space_outliner/outliner_dragdrop.c M source/blender/editors/uvedit/uvedit_ops.c M source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp M source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp M source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c M source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c M source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c M source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c M source/blender/makesrna/intern/rna_ID.c M source/blender/makesrna/intern/rna_brush.c M source/blender/makesrna/intern/rna_main_api.c M source/blender/makesrna/intern/rna_object.c M source/blender/makesrna/intern/rna_particle.c M source/blender/nodes/shader/node_shader_tree.c M source/blender/usd/intern/usd_writer_mesh.cc M source/blender/windowmanager/intern/wm_init_exit.c M source/blender/windowmanager/intern/wm_operators.c M source/creator/creator.c =================================================================== diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc index 3eee390d7d3..f7a18b0325e 100644 --- a/source/blender/alembic/intern/abc_mesh.cc +++ b/source/blender/alembic/intern/abc_mesh.cc @@ -589,7 +589,7 @@ void AbcGenericMeshWriter::getGeoGroups(struct Mesh *mesh, MPoly ¤t_poly = polygons[i]; short mnr = current_poly.mat_nr; - Material *mat = give_current_material(m_object, mnr + 1); + Material *mat = BKE_object_material_get(m_object, mnr + 1); if (!mat) { continue; @@ -606,7 +606,7 @@ void AbcGenericMeshWriter::getGeoGroups(struct Mesh *mesh, } if (geo_groups.size() == 0) { - Material *mat = give_current_material(m_object, 1); + Material *mat = BKE_object_material_get(m_object, 1); std::string name = (mat) ? get_id_name(&mat->id) : "default"; @@ -691,7 +691,7 @@ static void assign_materials(Main *bmain, assigned_mat = mat_iter->second; } - assign_material(bmain, ob, assigned_mat, it->second, BKE_MAT_ASSIGN_OBDATA); + BKE_object_material_assign(bmain, ob, assigned_mat, it->second, BKE_MAT_ASSIGN_OBDATA); } } } diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h index d7b037a8189..a0a41a048e3 100644 --- a/source/blender/blenkernel/BKE_material.h +++ b/source/blender/blenkernel/BKE_material.h @@ -37,11 +37,11 @@ struct bNode; /* materials */ -void init_def_material(void); -void BKE_material_gpencil_default_free(void); +void BKE_materials_init(void); +void BKE_materials_exit(void); void BKE_material_free(struct Material *ma); -void test_object_materials(struct Main *bmain, struct Object *ob, struct ID *id); -void test_all_objects_materials(struct Main *bmain, struct ID *id); +void BKE_object_materials_test(struct Main *bmain, struct Object *ob, struct ID *id); +void BKE_objects_materials_test_all(struct Main *bmain, struct ID *id); void BKE_material_resize_object(struct Main *bmain, struct Object *ob, const short totcol, @@ -53,7 +53,7 @@ void BKE_material_remap_object_calc(struct Object *ob_dst, struct Object *ob_src, short *remap_src_to_dst); struct Material *BKE_material_add(struct Main *bmain, const char *name); -struct Material *BKE_material_add_gpencil(struct Main *bmain, const char *name); +struct Material *BKE_gpencil_material_add(struct Main *bmain, const char *name); void BKE_material_copy_data(struct Main *bmain, struct Material *ma_dst, const struct Material *ma_src, @@ -62,17 +62,17 @@ struct Material *BKE_material_copy(struct Main *bmain, const struct Material *ma struct Material *BKE_material_localize(struct Material *ma); struct Material *give_node_material(struct Material *ma); /* returns node material or self */ void BKE_material_make_local(struct Main *bmain, struct Material *ma, const bool lib_local); -void BKE_material_init_gpencil_settings(struct Material *ma); +void BKE_gpencil_material_attr_init(struct Material *ma); /* UNUSED */ // void automatname(struct Material *); /* material slots */ -struct Material ***give_matarar(struct Object *ob); -short *give_totcolp(struct Object *ob); -struct Material ***give_matarar_id(struct ID *id); /* same but for ID's */ -short *give_totcolp_id(struct ID *id); +struct Material ***BKE_object_material_array(struct Object *ob); +short *BKE_object_material_num(struct Object *ob); +struct Material ***BKE_id_material_array(struct ID *id); /* same but for ID's */ +short *BKE_id_material_num(struct ID *id); enum { /* use existing link option */ @@ -82,21 +82,21 @@ enum { BKE_MAT_ASSIGN_OBJECT, }; -struct Material **give_current_material_p(struct Object *ob, short act); -struct Material *give_current_material(struct Object *ob, short act); -void assign_material_id(struct Main *bmain, struct ID *id, struct Material *ma, short act); -void assign_material( +struct Material **BKE_object_material_get_p(struct Object *ob, short act); +struct Material *BKE_object_material_get(struct Object *ob, short act); +void BKE_id_material_assign(struct Main *bmain, struct ID *id, struct Material *ma, short act); +void BKE_object_material_assign( struct Main *bmain, struct Object *ob, struct Material *ma, short act, int assign_type); -void assign_matarar(struct Main *bmain, struct Object *ob, struct Material ***matar, short totcol); +void BKE_object_material_array_assign(struct Main *bmain, struct Object *ob, struct Material ***matar, short totcol); short BKE_object_material_slot_find_index(struct Object *ob, struct Material *ma); bool BKE_object_material_slot_add(struct Main *bmain, struct Object *ob); bool BKE_object_material_slot_remove(struct Main *bmain, struct Object *ob); bool BKE_object_material_slot_used(struct ID *id, short actcol); -struct Material *BKE_material_gpencil_get(struct Object *ob, short act); -struct Material *BKE_material_gpencil_default_get(void); -struct MaterialGPencilStyle *BKE_material_gpencil_settings_get(struct Object *ob, short act); +struct Material *BKE_gpencil_material(struct Object *ob, short act); +struct Material *BKE_gpencil_material_default(void); +struct MaterialGPencilStyle *BKE_gpencil_material_settings(struct Object *ob, short act); void BKE_texpaint_slot_refresh_cache(struct Scene *scene, struct Material *ma); void BKE_texpaint_slots_refresh_object(struct Scene *scene, struct Object *ob); @@ -115,10 +115,10 @@ void BKE_material_clear_id(struct Main *bmain, struct ID *id); void ramp_blend(int type, float r_col[3], const float fac, const float col[3]); /* copy/paste */ -void clear_matcopybuf(void); -void free_matcopybuf(void); -void copy_matcopybuf(struct Main *bmain, struct Material *ma); -void paste_matcopybuf(struct Main *bmain, struct Material *ma); +void BKE_material_copybuf_clear(void); +void BKE_material_copybuf_free(void); +void BKE_material_copybuf_copy(struct Main *bmain, struct Material *ma); +void BKE_material_copybuf_paste(struct Main *bmain, struct Material *ma); /* Dependency graph evaluation. */ diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 721eb9a2a37..4f98290874e 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -290,7 +290,7 @@ void BKE_brush_gpencil_presets(Main *bmain, ToolSettings *ts) * drawn. */ Material *ma = BLI_findstring(&bmain->materials, "Black Dots", offsetof(ID, name) + 2); if (ma == NULL) { - ma = BKE_material_add_gpencil(bmain, "Black Dots"); + ma = BKE_gpencil_material_add(bmain, "Black Dots"); } brush->gpencil_settings->material = ma; /* Pin the matterial to the brush. */ diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c index b1cf8ad8570..e7242ca11a4 100644 --- a/source/blender/blenkernel/intern/gpencil.c +++ b/source/blender/blenkernel/intern/gpencil.c @@ -1121,14 +1121,14 @@ Material *BKE_gpencil_object_material_ensure_from_brush(Main *bmain, Object *ob, /* check if the material is already on object material slots and add it if missing */ if (ma && BKE_gpencil_object_material_get_index(ob, ma) < 0) { BKE_object_material_slot_add(bmain, ob); - assign_material(bmain, ob, ma, ob->totcol, BKE_MAT_ASSIGN_USERPREF); + BKE_object_material_assign(bmain, ob, ma, ob->totcol, BKE_MAT_ASSIGN_USERPREF); } return ma; } else { /* using active material instead */ - return give_current_material(ob, ob->actcol); + return BKE_object_material_get(ob, ob->actcol); } } @@ -1141,7 +1141,7 @@ int BKE_gpencil_object_material_ensure(Main *bmain, Object *ob, Material *materi int index = BKE_gpencil_object_material_get_index(ob, material); if (index < 0) { BKE_object_material_slot_add(bmain, ob); - assign_material(bmain, ob, material, ob->totcol, BKE_MAT_ASSIGN_USERPREF); + BKE_object_material_assign(bmain, ob, material, ob->totcol, BKE_MAT_ASSIGN_USERPREF); return ob->totcol - 1; } return index; @@ -1154,11 +1154,11 @@ int BKE_gpencil_object_material_ensure(Main *bmain, Object *ob, Material *materi */ Material *BKE_gpencil_object_material_new(Main *bmain, Object *ob, const char *name, int *r_index) { - Material *ma = BKE_material_add_gpencil(bmain, name); + Material *ma = BKE_gpencil_material_add(bmain, name); id_us_min(&ma->id); /* no users yet */ BKE_object_material_slot_add(bmain, ob); - assign_material(bmain, ob, ma, ob->totcol, BKE_MAT_ASSIGN_USERPREF); + BKE_object_material_assign(bmain, ob, ma, ob->totcol, BKE_MAT_ASSIGN_USERPREF); if (r_index) { *r_index = ob->actcol - 1; @@ -1175,7 +1175,7 @@ Material *BKE_gpencil_object_material_get_from_brush(Object *ob, Brush *brush) return ma; } else { - return give_current_material(ob, ob->actcol); + return BKE_object_material_get(ob, ob->actcol); } } @@ -1228,7 +1228,7 @@ Material *BKE_gpencil_object_material_ensure_from_active_input_brush(Main *bmain */ Material *BKE_gpencil_object_material_ensure_from_active_input_material(Object *ob) { - Material *ma = give_current_material(ob, ob->actcol); + Material *ma = BKE_object_material_get(ob, ob->actcol); if (ma) { return ma; } @@ -1248,7 +1248,7 @@ Material *BKE_gpencil_object_material_ensure_active(Object *ob) ma = BKE_gpencil_object_material_ensure_from_active_input_material(ob); if (ma->gp_style == NULL) { - BKE_material_init_gpencil_settings(ma); + BKE_gpencil_material_attr_init(ma); } return ma; @@ -2368,10 +2368,10 @@ void BKE_gpencil_stats_update(bGPdata *gpd) /* get material index (0-based like mat_nr not actcol) */ int BKE_gpencil_object_material_get_index(Object *ob, Material *ma) { - short *totcol = give_totcolp(ob); + short *totcol = BKE_object_material_num(ob); Material *read_ma = NULL; for (short i = 0; i < *totcol; i++) { - read_ma = give_current_material(ob, i + 1); + read_ma = BKE_object_material_get(ob, i + 1); if (ma == read_ma) { @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs