Commit: 979d22b361255cadba92fd5032d49d615e969692
Author: Bastien Montagne
Date: Mon Aug 10 15:48:13 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB979d22b361255cadba92fd5032d49d615e969692
Some cleanup re master...
===================================================================
M source/blender/blenloader/intern/readblenentry.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/writefile.c
===================================================================
diff --git a/source/blender/blenloader/intern/readblenentry.c
b/source/blender/blenloader/intern/readblenentry.c
index 6c1c626..e8d7a46 100644
--- a/source/blender/blenloader/intern/readblenentry.c
+++ b/source/blender/blenloader/intern/readblenentry.c
@@ -161,7 +161,6 @@ LinkNode *BLO_blendhandle_get_previews(BlendHandle *bh, int
ofblocktype, int *to
case ID_IM: /* fall through */
case ID_WO: /* fall through */
case ID_LA: /* fall through */
- case ID_BR: /* fall through */
case ID_OB: /* fall through */
case ID_GR: /* fall through */
case ID_SCE: /* fall through */
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index b6d9e34..ffe1889 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2013,7 +2013,7 @@ static void direct_link_brush(FileData *fd, Brush *brush)
else
BKE_brush_curve_preset(brush, CURVE_PRESET_SHARP);
- brush->preview = direct_link_preview_image(fd, brush->preview);
+ brush->preview = NULL;
brush->icon_imbuf = NULL;
}
diff --git a/source/blender/blenloader/intern/writefile.c
b/source/blender/blenloader/intern/writefile.c
index 1cfae75..2dfb100 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -3181,8 +3181,6 @@ static void write_brushes(WriteData *wd, ListBase *idbase)
write_curvemapping(wd, brush->curve);
if (brush->gradient)
writestruct(wd, DATA, "ColorBand", 1,
brush->gradient);
-
- write_previews(wd, brush->preview);
}
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
