diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/blenkernel/BKE_material.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/blenkernel/BKE_material.h')
-rw-r--r-- | source/blender/blenkernel/BKE_material.h | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h index 1c171ef6e7c..37c502b3b0c 100644 --- a/source/blender/blenkernel/BKE_material.h +++ b/source/blender/blenkernel/BKE_material.h @@ -40,13 +40,21 @@ void init_def_material(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_material_resize_object(struct Main *bmain, struct Object *ob, const short totcol, bool do_id_user); +void BKE_material_resize_object(struct Main *bmain, + struct Object *ob, + const short totcol, + bool do_id_user); void BKE_material_init(struct Material *ma); void BKE_material_remap_object(struct Object *ob, const unsigned int *remap); -void BKE_material_remap_object_calc(struct Object *ob_dst, struct Object *ob_src, short *remap_src_to_dst); +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); -void BKE_material_copy_data(struct Main *bmain, struct Material *ma_dst, const struct Material *ma_src, const int flag); +void BKE_material_copy_data(struct Main *bmain, + struct Material *ma_dst, + const struct Material *ma_src, + const int flag); 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 */ @@ -64,22 +72,23 @@ struct Material ***give_matarar_id(struct ID *id); /* same but for ID's */ short *give_totcolp_id(struct ID *id); enum { - /* use existing link option */ - BKE_MAT_ASSIGN_EXISTING, - BKE_MAT_ASSIGN_USERPREF, - BKE_MAT_ASSIGN_OBDATA, - BKE_MAT_ASSIGN_OBJECT, + /* use existing link option */ + BKE_MAT_ASSIGN_EXISTING, + BKE_MAT_ASSIGN_USERPREF, + BKE_MAT_ASSIGN_OBDATA, + 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); +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 Main *bmain, struct Object *ob, struct Material *ma, short act, int assign_type); +void assign_material( + 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); 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_add(struct Main *bmain, struct Object *ob); +bool BKE_object_material_slot_remove(struct Main *bmain, struct Object *ob); struct MaterialGPencilStyle *BKE_material_gpencil_settings_get(struct Object *ob, short act); @@ -89,7 +98,10 @@ void BKE_texpaint_slots_refresh_object(struct Scene *scene, struct Object *ob); /* rna api */ void BKE_material_resize_id(struct Main *bmain, struct ID *id, short totcol, bool do_id_user); void BKE_material_append_id(struct Main *bmain, struct ID *id, struct Material *ma); -struct Material *BKE_material_pop_id(struct Main *bmain, struct ID *id, int index, bool update_data); /* index is an int because of RNA */ +struct Material *BKE_material_pop_id(struct Main *bmain, + struct ID *id, + int index, + bool update_data); /* index is an int because of RNA */ void BKE_material_clear_id(struct Main *bmain, struct ID *id, bool update_data); /* rendering */ |