diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/makesrna/intern/rna_timeline.c | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/makesrna/intern/rna_timeline.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_timeline.c | 69 |
1 files changed, 35 insertions, 34 deletions
diff --git a/source/blender/makesrna/intern/rna_timeline.c b/source/blender/makesrna/intern/rna_timeline.c index d3dea9a769d..3308a493212 100644 --- a/source/blender/makesrna/intern/rna_timeline.c +++ b/source/blender/makesrna/intern/rna_timeline.c @@ -30,52 +30,53 @@ #ifdef RNA_RUNTIME -#include "WM_api.h" +# include "WM_api.h" -static void rna_TimelineMarker_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *UNUSED(ptr)) +static void rna_TimelineMarker_update(Main *UNUSED(bmain), + Scene *UNUSED(scene), + PointerRNA *UNUSED(ptr)) { - WM_main_add_notifier(NC_SCENE | ND_MARKERS, NULL); - WM_main_add_notifier(NC_ANIMATION | ND_MARKERS, NULL); + WM_main_add_notifier(NC_SCENE | ND_MARKERS, NULL); + WM_main_add_notifier(NC_ANIMATION | ND_MARKERS, NULL); } #else static void rna_def_timeline_marker(BlenderRNA *brna) { - StructRNA *srna; - PropertyRNA *prop; - - srna = RNA_def_struct(brna, "TimelineMarker", NULL); - RNA_def_struct_sdna(srna, "TimeMarker"); - RNA_def_struct_ui_text(srna, "Marker", "Marker for noting points in the timeline"); - - /* String values */ - prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); - RNA_def_property_ui_text(prop, "Name", ""); - RNA_def_struct_name_property(srna, prop); - RNA_def_property_update(prop, 0, "rna_TimelineMarker_update"); - - prop = RNA_def_property(srna, "frame", PROP_INT, PROP_TIME); - RNA_def_property_ui_text(prop, "Frame", "The frame on which the timeline marker appears"); - RNA_def_property_update(prop, 0, "rna_TimelineMarker_update"); - - prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", 1 /*SELECT*/); - RNA_def_property_ui_text(prop, "Select", "Marker selection state"); - RNA_def_property_update(prop, 0, "rna_TimelineMarker_update"); - -#ifdef DURIAN_CAMERA_SWITCH - prop = RNA_def_property(srna, "camera", PROP_POINTER, PROP_NONE); - RNA_def_property_struct_type(prop, "Object"); - RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK); - RNA_def_property_ui_text(prop, "Camera", "Camera that becomes active on this frame"); -#endif + StructRNA *srna; + PropertyRNA *prop; + + srna = RNA_def_struct(brna, "TimelineMarker", NULL); + RNA_def_struct_sdna(srna, "TimeMarker"); + RNA_def_struct_ui_text(srna, "Marker", "Marker for noting points in the timeline"); + + /* String values */ + prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); + RNA_def_property_ui_text(prop, "Name", ""); + RNA_def_struct_name_property(srna, prop); + RNA_def_property_update(prop, 0, "rna_TimelineMarker_update"); + + prop = RNA_def_property(srna, "frame", PROP_INT, PROP_TIME); + RNA_def_property_ui_text(prop, "Frame", "The frame on which the timeline marker appears"); + RNA_def_property_update(prop, 0, "rna_TimelineMarker_update"); + + prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "flag", 1 /*SELECT*/); + RNA_def_property_ui_text(prop, "Select", "Marker selection state"); + RNA_def_property_update(prop, 0, "rna_TimelineMarker_update"); + +# ifdef DURIAN_CAMERA_SWITCH + prop = RNA_def_property(srna, "camera", PROP_POINTER, PROP_NONE); + RNA_def_property_struct_type(prop, "Object"); + RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK); + RNA_def_property_ui_text(prop, "Camera", "Camera that becomes active on this frame"); +# endif } void RNA_def_timeline_marker(BlenderRNA *brna) { - rna_def_timeline_marker(brna); + rna_def_timeline_marker(brna); } - #endif |