[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25862] trunk/blender/source/blender: [ #20587] Time field under Stamp (rendering) is always showing 00:00:00.01
Campbell Barton
ideasman42 at gmail.com
Sun Jan 10 11:50:11 CET 2010
Revision: 25862
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25862
Author: campbellbarton
Date: 2010-01-10 11:50:11 +0100 (Sun, 10 Jan 2010)
Log Message:
-----------
[#20587] Time field under Stamp (rendering) is always showing 00:00:00.01
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/intern/pbvh.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
Modified: trunk/blender/source/blender/blenlib/intern/pbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/pbvh.c 2010-01-10 10:33:13 UTC (rev 25861)
+++ trunk/blender/source/blender/blenlib/intern/pbvh.c 2010-01-10 10:50:11 UTC (rev 25862)
@@ -634,6 +634,8 @@
iter->stacksize--;
node= iter->stack[iter->stacksize].node;
+ /* on a mesh with no faces this can happen
+ * can remove this check if we know meshes have at least 1 face */
if(node==NULL)
return NULL;
Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c 2010-01-10 10:33:13 UTC (rev 25861)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c 2010-01-10 10:50:11 UTC (rev 25862)
@@ -2241,7 +2241,7 @@
prop= RNA_def_property(srna, "stamp_time", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "stamp", R_STAMP_TIME);
- RNA_def_property_ui_text(prop, "Stamp Time", "Include the current time in image metadata");
+ RNA_def_property_ui_text(prop, "Stamp Time", "Include the render frame as HH:MM:SS.FF in image metadata");
RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
prop= RNA_def_property(srna, "stamp_date", PROP_BOOLEAN, PROP_NONE);
More information about the Bf-blender-cvs
mailing list