archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merging r46203 through r46413 from trunk into soc-2011-tomato

Browse Source
This commit is contained in:
Sergey Sharybin
2012-05-08 13:01:16 +00:00
parent 398884d186 7a4ad3aaae
commit 16d93f3881
542 changed files with 35289 additions and 32718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/include/ED_clip.h
View File

@@ -81,8 +81,6 @@ int ED_space_clip_show_trackedit(struct SpaceClip *sc);
int ED_space_clip_show_maskedit(struct SpaceClip *sc);
void ED_space_clip_set_mask(struct bContext *C, struct SpaceClip *sc, struct Mask *mask);
void ED_space_clip_update_dopesheet(struct SpaceClip *sc);
/* clip_ops.c */
void ED_operatormacros_clip(void);