Blender Git Commit Log

Git Commits -> Revision a132674

Revision a132674 by Campbell Barton (master)
January 7, 2011, 06:50 (GMT)
patch [#25490] Fix for [#22096] Blender tries to open non-blend file
from Alexander Kuznetsov (alexk) with edits.

From the report:
Blender assumed that all files are .blend as retval = 0;

Now retval is initialized as file cannot be open (-1) for gzopen fail and directory case
retval = -2; is defined for not supported formats
This must be assigned before #ifdef WITH_PYTHON because this part can be missing
Finally retval = 0; if it is a .blend file

---
also made other edits.

- exotic.c's blend header checking was sloppy, didn't check data was actually read, only checked first 4 bytes and had a check for "blend.gz" extension which is unnecessary.
- use defines to help readability for BKE_read_exotic & BKE_read_file return values.
- no need to check for a NULL pointer before calling BKE_reportf(). (will just print to the console)
- print better reports when the file fails to load.

Commit Details:

Full Hash: a13267463425d22f69d3d1d313df921e6c1238f9
SVN Revision: 34143
Parent Commit: 0db684b
Lines Changed: +53, -39

7 Modified Paths:

/source/blender/blenkernel/BKE_blender.h (+5, -0) (Diff)
/source/blender/blenkernel/BKE_exotic.h (+7, -0) (Diff)
/source/blender/blenkernel/BKE_utildefines.h (+0, -2) (Diff)
/source/blender/blenkernel/intern/blender.c (+1, -7) (Diff)
/source/blender/blenkernel/intern/exotic.c (+21, -20) (Diff)
/source/blender/windowmanager/intern/wm_files.c (+18, -9) (Diff)
/source/creator/creator.c (+1, -1) (Diff)
By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021