[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52891] trunk/blender/source/blender/ blenkernel/intern/image.c: image stamp data' s strings could be short enough not to fit the entire ID name length.
Campbell Barton
ideasman42 at gmail.com
Tue Dec 11 16:14:35 CET 2012
Revision: 52891
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52891
Author: campbellbarton
Date: 2012-12-11 15:14:35 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
image stamp data's strings could be short enough not to fit the entire ID name length.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/image.c
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2012-12-11 15:10:19 UTC (rev 52890)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2012-12-11 15:14:35 UTC (rev 52891)
@@ -1400,7 +1400,9 @@
}
}
-/* could allow access externally - 512 is for long names, 64 is for id names */
+#define STAMP_NAME_SIZE ((MAX_ID_NAME - 2) + 16)
+/* could allow access externally - 512 is for long names,
+ * STAMP_NAME_SIZE is for id names, allowing them some room for description */
typedef struct StampData {
char file[512];
char note[512];
@@ -1408,12 +1410,13 @@
char marker[512];
char time[512];
char frame[512];
- char camera[64];
- char cameralens[64];
- char scene[64];
- char strip[64];
- char rendertime[64];
+ char camera[STAMP_NAME_SIZE];
+ char cameralens[STAMP_NAME_SIZE];
+ char scene[STAMP_NAME_SIZE];
+ char strip[STAMP_NAME_SIZE];
+ char rendertime[STAMP_NAME_SIZE];
} StampData;
+#undef STAMP_NAME_SIZE
static void stampdata(Scene *scene, Object *camera, StampData *stamp_data, int do_prefix)
{
More information about the Bf-blender-cvs
mailing list