[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34004] trunk/blender/source/blender: Small feature for debugging pleasure:
Ton Roosendaal
ton at blender.org
Sun Jan 2 14:33:32 CET 2011
Revision: 34004
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34004
Author: ton
Date: 2011-01-02 14:33:32 +0100 (Sun, 02 Jan 2011)
Log Message:
-----------
Small feature for debugging pleasure:
The svn revision nr is saved in Blender file header now.
Can only be retrieved with running blender -d now.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_main.h
trunk/blender/source/blender/blenloader/CMakeLists.txt
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/makesdna/DNA_constraint_types.h
trunk/blender/source/blender/makesdna/DNA_fileglobal_types.h
Modified: trunk/blender/source/blender/blenkernel/BKE_main.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_main.h 2011-01-02 11:14:47 UTC (rev 34003)
+++ trunk/blender/source/blender/blenkernel/BKE_main.h 2011-01-02 13:33:32 UTC (rev 34004)
@@ -51,6 +51,7 @@
char name[240];
short versionfile, subversionfile;
short minversionfile, minsubversionfile;
+ int revision; /* svn revision of binary that saved file */
struct Library *curlib;
ListBase scene;
Modified: trunk/blender/source/blender/blenloader/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenloader/CMakeLists.txt 2011-01-02 11:14:47 UTC (rev 34003)
+++ trunk/blender/source/blender/blenloader/CMakeLists.txt 2011-01-02 13:33:32 UTC (rev 34004)
@@ -50,4 +50,8 @@
intern/readfile.h
)
+if(WITH_BUILDINFO)
+ add_definitions(-DNAN_BUILDINFO)
+endif()
+
blender_add_lib(bf_blenloader "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2011-01-02 11:14:47 UTC (rev 34003)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2011-01-02 13:33:32 UTC (rev 34004)
@@ -5654,12 +5654,14 @@
bfd->main->subversionfile= fg->subversion;
bfd->main->minversionfile= fg->minversion;
bfd->main->minsubversionfile= fg->minsubversion;
+ bfd->main->revision= fg->revision;
bfd->winpos= fg->winpos;
bfd->fileflags= fg->fileflags;
bfd->displaymode= fg->displaymode;
bfd->globalf= fg->globalf;
BLI_strncpy(bfd->filename, fg->filename, sizeof(bfd->filename));
+
if(G.fileflags & G_FILE_RECOVER)
BLI_strncpy(fd->relabase, fg->filename, sizeof(fd->relabase));
@@ -6642,7 +6644,7 @@
/* WATCH IT!!!: pointers from libdata have not been converted */
if(G.f & G_DEBUG)
- printf("read file %s\n Version %d sub %d\n", fd->relabase, main->versionfile, main->subversionfile);
+ printf("read file %s\n Version %d sub %d svn r%d\n", fd->relabase, main->versionfile, main->subversionfile, main->revision);
if(main->versionfile == 100) {
/* tex->extend and tex->imageflag have changed: */
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2011-01-02 11:14:47 UTC (rev 34003)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2011-01-02 13:33:32 UTC (rev 34004)
@@ -2375,7 +2375,15 @@
fg.subversion= BLENDER_SUBVERSION;
fg.minversion= BLENDER_MINVERSION;
fg.minsubversion= BLENDER_MINSUBVERSION;
- fg.pads= 0; /* prevent mem checkers from complaining */
+#ifdef NAN_BUILDINFO
+ {
+ extern char build_rev[];
+ fg.revision= atoi(build_rev);
+ }
+#else
+ fg.revision= 0;
+#endif
+ fg.pads= fg.pad= 0; /* prevent mem checkers from complaining */
writestruct(wd, GLOB, "FileGlobal", 1, &fg);
}
Modified: trunk/blender/source/blender/makesdna/DNA_constraint_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_constraint_types.h 2011-01-02 11:14:47 UTC (rev 34003)
+++ trunk/blender/source/blender/makesdna/DNA_constraint_types.h 2011-01-02 13:33:32 UTC (rev 34004)
@@ -541,7 +541,7 @@
UP_Z
} eUpAxis_Modes;
-/* Tracking axis (TrackTo, Locked Track, Damped Track) */
+/* Tracking axis (TrackTo, Locked Track, Damped Track) and minmax (floor) constraint */
typedef enum eTrackToAxis_Modes {
TRACK_X = 0,
TRACK_Y,
Modified: trunk/blender/source/blender/makesdna/DNA_fileglobal_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_fileglobal_types.h 2011-01-02 11:14:47 UTC (rev 34003)
+++ trunk/blender/source/blender/makesdna/DNA_fileglobal_types.h 2011-01-02 13:33:32 UTC (rev 34004)
@@ -47,7 +47,8 @@
struct Scene *curscene;
int fileflags;
int globalf;
-
+ int revision; /* svn revision from buildinfo */
+ int pad;
/* file path where this was saved, for recover */
char filename[240]; /* 240 = FILE_MAX */
} FileGlobal;
More information about the Bf-blender-cvs
mailing list