svn merge ^/trunk/blender -r47423:47506
authorCampbell Barton <ideasman42@gmail.com>
Wed, 6 Jun 2012 10:25:59 +0000 (10:25 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 6 Jun 2012 10:25:59 +0000 (10:25 +0000)
15 files changed:
1  2 
release/scripts/startup/bl_ui/space_clip.py
source/blender/blenkernel/intern/movieclip.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_clip/clip_buttons.c
source/blender/editors/space_clip/clip_draw.c
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_ops.c
source/blender/makesdna/DNA_node_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_movieclip.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_space.c

@@@ -284,7 -284,19 +284,20 @@@ static void rna_def_movieclip(BlenderRN
        RNA_def_property_flag(prop, PROP_EDITABLE);
        RNA_def_property_struct_type(prop, "GreasePencil");
        RNA_def_property_ui_text(prop, "Grease Pencil", "Grease pencil data for this movie clip");
 +      RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
+       /* use custom offset */
+       prop = RNA_def_property(srna, "use_custom_start_frame", PROP_BOOLEAN, PROP_NONE);
+       RNA_def_property_boolean_sdna(prop, NULL, "flag", MCLIP_CUSTOM_START_FRAME);
+       RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+       RNA_def_property_ui_text(prop, "Custom Start Frame", "Use custom first frame offset instead of automatic frame number");
+       RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, "rna_MovieClip_reload_update");
+       /* frame offset */
+       prop = RNA_def_property(srna, "start_frame", PROP_INT, PROP_NONE);
+       RNA_def_property_int_sdna(prop, NULL, "start_frame");
+       RNA_def_property_ui_text(prop, "Start Frame", "Number of frame from sequence or movie displaying at scene frame #1");
+       RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, "rna_MovieClip_reload_update");
  }
  
  void RNA_def_movieclip(BlenderRNA *brna)