Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2020-09-10 17:23:53 +0300
committerJacques Lucke <jacques@blender.org>2020-09-10 17:23:53 +0300
commitea1094bdb0419b97174dd95a5887cd6cf2732d22 (patch)
treea2ab492975f0cdc3b175453624d8aba43b1e1c54 /source/blender/blenloader/intern/writefile.c
parent94c533ac35d4ad5d944c214d4809011b61be4a94 (diff)
Refactor: move Material .blend I/O to IDTypeInfo callbacks
Diffstat (limited to 'source/blender/blenloader/intern/writefile.c')
-rw-r--r--source/blender/blenloader/intern/writefile.c34
1 files changed, 1 insertions, 33 deletions
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 24ca503b895..acf4e1ca635 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1531,36 +1531,6 @@ static void write_texture(BlendWriter *writer, Tex *tex, const void *id_address)
}
}
-static void write_material(BlendWriter *writer, Material *ma, const void *id_address)
-{
- if (ma->id.us > 0 || BLO_write_is_undo(writer)) {
- /* Clean up, important in undo case to reduce false detection of changed datablocks. */
- ma->texpaintslot = NULL;
- BLI_listbase_clear(&ma->gpumaterial);
-
- /* write LibData */
- BLO_write_id_struct(writer, Material, id_address, &ma->id);
- BKE_id_blend_write(writer, &ma->id);
-
- if (ma->adt) {
- BKE_animdata_blend_write(writer, ma->adt);
- }
-
- /* nodetree is integral part of material, no libdata */
- if (ma->nodetree) {
- BLO_write_struct(writer, bNodeTree, ma->nodetree);
- ntreeBlendWrite(writer, ma->nodetree);
- }
-
- BKE_previewimg_blend_write(writer, ma->preview);
-
- /* grease pencil settings */
- if (ma->gp_style) {
- BLO_write_struct(writer, MaterialGPencilStyle, ma->gp_style);
- }
- }
-}
-
static void write_world(BlendWriter *writer, World *wrld, const void *id_address)
{
if (wrld->id.us > 0 || BLO_write_is_undo(writer)) {
@@ -2891,9 +2861,6 @@ static bool write_file_handle(Main *mainvar,
case ID_OB:
write_object(&writer, (Object *)id_buffer, id);
break;
- case ID_MA:
- write_material(&writer, (Material *)id_buffer, id);
- break;
case ID_TE:
write_texture(&writer, (Tex *)id_buffer, id);
break;
@@ -2931,6 +2898,7 @@ static bool write_file_handle(Main *mainvar,
case ID_BR:
case ID_IM:
case ID_LA:
+ case ID_MA:
/* Do nothing, handled in IDTypeInfo callback. */
break;
case ID_LI: