diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-01-10 13:50:11 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-01-10 13:50:11 +0300 |
| commit | e26005795d17d4d0516364ab1bcedd4dd7058efe (patch) | |
| tree | 784a454e733006b951731dfa5c865fe6eaec879a /source | |
| parent | 508371001a5d33e530ecfbeb6df59783a16b02c4 (diff) | |
[#20587] Time field under Stamp (rendering) is always showing 00:00:00.01
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenlib/intern/pbvh.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/pbvh.c b/source/blender/blenlib/intern/pbvh.c index 676b6d4da40..0133017eb4d 100644 --- a/source/blender/blenlib/intern/pbvh.c +++ b/source/blender/blenlib/intern/pbvh.c @@ -634,6 +634,8 @@ static PBVHNode *pbvh_iter_next(PBVHIter *iter) 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; diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 82c7de36eab..f3903b97d21 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -2241,7 +2241,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna) 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); |