Commit: 945f32e66d6ada2a05b7700a197209b9c66b4682
Author: Bastien Montagne
Date: Wed Jul 22 11:54:53 2015 +0200
Branches: master
https://developer.blender.org/rB945f32e66d6ada2a05b7700a197209b9c66b4682
Fix crash with recent refactor of customdata writing.
Caused by own rBff3d535bc2a6309 - since we now only write the exact amount of
layers
needed to store saved customdata, we have to adjust CustomData->maxlayer too.
Otherwise, on next read, customdata code believes it has more layers allocated
than
actual number.
Issue reported by Campbell over IRC, thanks.
===================================================================
M source/blender/blenkernel/intern/customdata.c
===================================================================
diff --git a/source/blender/blenkernel/intern/customdata.c
b/source/blender/blenkernel/intern/customdata.c
index abfe746..b1740d4 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -3251,6 +3251,7 @@ void CustomData_file_write_prepare(
}
}
BLI_assert(j == data->totlayer);
+ data->maxlayer = data->totlayer; /* We only write that much of data! */
*r_write_layers = write_layers;
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
