diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-08-19 13:04:49 +0400 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-08-19 13:04:49 +0400 |
| commit | 7c786e28c4965fc7314d7a2a3521f41f9b562726 (patch) | |
| tree | 68fc6352398e2fb1dba9bf0272e985abf9d176a0 /source/blender/makesrna/intern/rna_image.c | |
| parent | 09042ce9a507b7f9ea36a63e60bbda6266541579 (diff) | |
| parent | 680f88017fda17582ac5b4c7e1b3afecbb56b2f8 (diff) | |
Merge with 2.5 -r 22173:22620.
Diffstat (limited to 'source/blender/makesrna/intern/rna_image.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_image.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c index 5366296a6b8..c96b1265126 100644 --- a/source/blender/makesrna/intern/rna_image.c +++ b/source/blender/makesrna/intern/rna_image.c @@ -116,7 +116,7 @@ static void rna_def_imageuser(BlenderRNA *brna) RNA_def_property_range(prop, -MAXFRAMEF, MAXFRAMEF); RNA_def_property_ui_text(prop, "Offset", "Offsets the number of the frame to use in the animation."); - prop= RNA_def_property(srna, "start_frame", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "start_frame", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "sfra"); RNA_def_property_range(prop, 1.0f, MAXFRAMEF); RNA_def_property_ui_text(prop, "Start Frame", "Sets the global starting frame of the movie."); @@ -242,7 +242,7 @@ static void rna_def_image(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Mapping", "Mapping type to use for this image in the game engine."); RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL); - prop= RNA_def_property(srna, "display_aspect", PROP_FLOAT, PROP_VECTOR); + prop= RNA_def_property(srna, "display_aspect", PROP_FLOAT, PROP_XYZ); RNA_def_property_float_sdna(prop, NULL, "aspx"); RNA_def_property_array(prop, 2); RNA_def_property_range(prop, 0.1f, 5000.0f); |