diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-02-06 15:05:45 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-02-06 15:36:39 +0300 |
| commit | 62ca9bcd0a7ff6fe52e359521369fc8b063d082a (patch) | |
| tree | 7aae08f2a67b3ca12e01e524e3759ae226adf936 /source/blender/blenkernel/BKE_material.h | |
| parent | dd00e8ecd642cafc6294ec7f0f31c5e0e0fe9870 (diff) | |
Cleanup: refactor default materials and shader nodes
Diffstat (limited to 'source/blender/blenkernel/BKE_material.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_material.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h index 0fd08dc3246..4bec0b1983e 100644 --- a/source/blender/blenkernel/BKE_material.h +++ b/source/blender/blenkernel/BKE_material.h @@ -35,10 +35,13 @@ struct Object; struct Scene; struct bNode; -/* materials */ +/* Module */ void BKE_materials_init(void); void BKE_materials_exit(void); + +/* Materials */ + void BKE_material_free(struct Material *ma); 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); @@ -47,7 +50,6 @@ void BKE_material_resize_object(struct Main *bmain, const short totcol, bool do_id_user); void BKE_material_init(struct Material *ma); -void BKE_material_gpencil_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, @@ -97,7 +99,6 @@ 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_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); @@ -122,15 +123,21 @@ 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); +/* Default Materials */ + +struct Material *BKE_material_default_empty(void); +struct Material *BKE_material_default_surface(void); +struct Material *BKE_material_default_volume(void); +struct Material *BKE_material_default_gpencil(void); + +void BKE_material_defaults_free_gpu(void); + /* Dependency graph evaluation. */ struct Depsgraph; void BKE_material_eval(struct Depsgraph *depsgraph, struct Material *material); -extern struct Material defmaterial; -extern struct Material defgpencil_material; - #ifdef __cplusplus } #endif |