diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-05-05 15:40:42 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-05-05 15:40:42 +0400 |
| commit | bb1f8d9586220446c4df6339554b6cb0af02f030 (patch) | |
| tree | 8b0778b7f5e8eb18b7ce817e150efc949adcab22 /source/blender/makesrna/intern/rna_action.c | |
| parent | 19e27ce15b213bc7c888e4a57ad97faa5dbb4220 (diff) | |
| parent | f1e3c31d4ffa86b695fddd45d9ccc6ce9ac62ea7 (diff) | |
Merged changes in the trunk up to revision 46309.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_tools.c
Diffstat (limited to 'source/blender/makesrna/intern/rna_action.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_action.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c index 76af6309ecf..299e1671394 100644 --- a/source/blender/makesrna/intern/rna_action.c +++ b/source/blender/makesrna/intern/rna_action.c @@ -191,7 +191,7 @@ static void rna_Action_active_pose_marker_index_range(PointerRNA *ptr, int *min, -static void rna_Action_frame_range_get(PointerRNA *ptr,float *values) +static void rna_Action_frame_range_get(PointerRNA *ptr, float *values) { /* don't include modifiers because they too easily can have very large * ranges: MINAFRAMEF to MAXFRAMEF. */ calc_action_range(ptr->id.data, values, values+1, FALSE); @@ -623,9 +623,9 @@ static void rna_def_action(BlenderRNA *brna) rna_def_action_pose_markers(brna, prop); /* properties */ - prop = RNA_def_float_vector(srna, "frame_range" , 2 , NULL , 0, 0, "Frame Range" , - "The final frame range of all F-Curves within this action" , 0 , 0); - RNA_def_property_float_funcs(prop, "rna_Action_frame_range_get" , NULL, NULL); + prop = RNA_def_float_vector(srna, "frame_range", 2, NULL, 0, 0, "Frame Range", + "The final frame range of all F-Curves within this action", 0, 0); + RNA_def_property_float_funcs(prop, "rna_Action_frame_range_get", NULL, NULL); RNA_def_property_clear_flag(prop, PROP_EDITABLE); /* special "type" limiter - should not really be edited in general, |