← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/blender/makesrna/intern/rna_timeline.c

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/makesrna/intern/rna_timeline.c
41
41
 
42
42
static void rna_TimelineMarker_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *UNUSED(ptr))
43
43
{
44
 
        WM_main_add_notifier(NC_SCENE|ND_MARKERS, NULL);
45
 
        WM_main_add_notifier(NC_ANIMATION|ND_MARKERS, NULL);
 
44
        WM_main_add_notifier(NC_SCENE | ND_MARKERS, NULL);
 
45
        WM_main_add_notifier(NC_ANIMATION | ND_MARKERS, NULL);
46
46
}
47
47
 
48
48
#else
74
74
#ifdef DURIAN_CAMERA_SWITCH
75
75
        prop = RNA_def_property(srna, "camera", PROP_POINTER, PROP_NONE);
76
76
        RNA_def_property_struct_type(prop, "Object");
77
 
        RNA_def_property_flag(prop, PROP_EDITABLE|PROP_ID_SELF_CHECK);
 
77
        RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
78
78
        RNA_def_property_ui_text(prop, "Camera", "Camera this timeline sets to active");
79
79
#endif
80
80
}