diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-03 16:44:52 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-03 16:44:52 +0400 |
| commit | eb9d591898e93dbbe9e28865018175b9da730596 (patch) | |
| tree | 3209caefe505273e834a936e54f6146a4185e83b /source/blender/makesrna/intern/rna_scene.c | |
| parent | 6d7490632f13f9744c6b3e507c838a34f3481846 (diff) | |
| parent | f1fb54e126824ff38b8bf26fa80f3f46c886bd45 (diff) | |
* Merging trunk up to r38981.
* Fixing a minor issue in a previous commit.
Diffstat (limited to 'source/blender/makesrna/intern/rna_scene.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index f2618280fa2..4b33d23cfe2 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -3291,7 +3291,7 @@ void RNA_def_scene(BlenderRNA *brna) RNA_def_property_int_sdna(prop, NULL, "r.cfra"); RNA_def_property_range(prop, MINAFRAME, MAXFRAME); RNA_def_property_int_funcs(prop, NULL, "rna_Scene_current_frame_set", NULL); - RNA_def_property_ui_text(prop, "Current Frame", "Current Frame"); + RNA_def_property_ui_text(prop, "Current Frame", "Current Frame, to update animation data from python frame_set() instead"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); RNA_def_property_update(prop, NC_SCENE|ND_FRAME, "rna_Scene_frame_update"); |