diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-07 19:23:08 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-07 19:23:08 +0400 |
commit | 5ef9039b7e2ea16bd4b651aab21d5aa690485569 (patch) | |
tree | e67247fa43d89748900b697eb9bdf0341fe53afc /source/blender/editors/include | |
parent | fb56dbc2afc7c8b6ffc24406ed82cbcbff090da3 (diff) | |
parent | 5ebee683bd736ef80df939552bbe0d8e104b56df (diff) |
Cycles: svn merge -r41531:41613 ^/trunk/blender
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r-- | source/blender/editors/include/ED_anim_api.h | 4 | ||||
-rw-r--r-- | source/blender/editors/include/ED_armature.h | 4 | ||||
-rw-r--r-- | source/blender/editors/include/ED_clip.h | 64 | ||||
-rw-r--r-- | source/blender/editors/include/ED_fluidsim.h | 5 | ||||
-rw-r--r-- | source/blender/editors/include/ED_logic.h | 3 | ||||
-rw-r--r-- | source/blender/editors/include/ED_particle.h | 4 | ||||
-rw-r--r-- | source/blender/editors/include/ED_space_api.h | 1 | ||||
-rw-r--r-- | source/blender/editors/include/ED_transform.h | 5 | ||||
-rw-r--r-- | source/blender/editors/include/ED_view3d.h | 6 | ||||
-rw-r--r-- | source/blender/editors/include/UI_icons.h | 6 | ||||
-rw-r--r-- | source/blender/editors/include/UI_interface.h | 29 | ||||
-rw-r--r-- | source/blender/editors/include/UI_resources.h | 13 |
12 files changed, 109 insertions, 35 deletions
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index 0ac5a9e46ce..6b449f68e1d 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -462,10 +462,8 @@ enum { DRAWCFRA_SHOW_NUMBOX = (1<<0), /* time indication in seconds or frames */ DRAWCFRA_UNIT_SECONDS = (1<<1), - /* show time-offset line */ - DRAWCFRA_SHOW_TIMEOFS = (1<<2), /* draw indicator extra wide (for timeline) */ - DRAWCFRA_WIDE = (1<<3) + DRAWCFRA_WIDE = (1<<2) } eAnimEditDraw_CurrentFrame; /* main call to draw current-frame indicator in an Animation Editor */ diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h index 121c53f7c65..2e9186b6c2f 100644 --- a/source/blender/editors/include/ED_armature.h +++ b/source/blender/editors/include/ED_armature.h @@ -141,7 +141,7 @@ void create_vgroups_from_armature(struct ReportList *reports, struct Scene *scen void auto_align_armature(struct Scene *scene, struct View3D *v3d, short mode); void unique_editbone_name(struct ListBase *ebones, char *name, EditBone *bone); /* if bone is already in list, pass it as param to ignore it */ -void ED_armature_bone_rename(struct bArmature *arm, char *oldnamep, char *newnamep); +void ED_armature_bone_rename(struct bArmature *arm, const char *oldnamep, const char *newnamep); void undo_push_armature(struct bContext *C, const char *name); @@ -163,7 +163,7 @@ void BIF_deleteSketch(struct bContext *C); void BIF_selectAllSketch(struct bContext *C, int mode); /* -1: deselect, 0: select, 1: toggle */ void BIF_makeListTemplates(const struct bContext *C); -char *BIF_listTemplates(const struct bContext *C); +const char *BIF_listTemplates(const struct bContext *C); int BIF_currentTemplate(const struct bContext *C); void BIF_freeTemplates(struct bContext *C); void BIF_setTemplate(struct bContext *C, int index); diff --git a/source/blender/editors/include/ED_clip.h b/source/blender/editors/include/ED_clip.h new file mode 100644 index 00000000000..7d36159f47e --- /dev/null +++ b/source/blender/editors/include/ED_clip.h @@ -0,0 +1,64 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2009 Blender Foundation. + * All rights reserved. + * + * Contributor(s): Blender Foundation, + * Sergey Sharybin + * + * ***** END GPL LICENSE BLOCK ***** + */ + +/** \file ED_clip.h + * \ingroup editors + */ + +#ifndef ED_MOVIECLIP_H +#define ED_MOVIECLIP_H + +struct ARegion; +struct bContext; +struct ImBuf; +struct Main; +struct MovieClip; +struct SpaceClip; +struct wmEvent; + +/* clip_editor.c */ +int ED_space_clip_poll(struct bContext *C); + +void ED_space_clip_set(struct bContext *C, struct SpaceClip *sc, struct MovieClip *clip); +struct MovieClip *ED_space_clip(struct SpaceClip *sc); +void ED_space_clip_size(struct SpaceClip *sc, int *width, int *height); +void ED_space_clip_zoom(struct SpaceClip *sc, ARegion *ar, float *zoomx, float *zoomy); +void ED_space_clip_aspect(struct SpaceClip *sc, float *aspx, float *aspy); + +struct ImBuf *ED_space_clip_get_buffer(struct SpaceClip *sc); +struct ImBuf *ED_space_clip_get_stable_buffer(struct SpaceClip *sc, float loc[2], float *scale, float *angle); + +void ED_clip_update_frame(const struct Main *mainp, int cfra); +int ED_clip_view_selection(struct SpaceClip *sc, struct ARegion *ar, int fit); + +void ED_clip_point_undistorted_pos(SpaceClip *sc, float co[2], float nco[2]); +void ED_clip_point_stable_pos(struct bContext *C, float x, float y, float *xr, float *yr); +void ED_clip_mouse_pos(struct bContext *C, struct wmEvent *event, float co[2]); + +/* clip_ops.c */ +void ED_operatormacros_clip(void); + +#endif /* ED_TEXT_H */ diff --git a/source/blender/editors/include/ED_fluidsim.h b/source/blender/editors/include/ED_fluidsim.h index f48b5df56c0..d47ba2bfba9 100644 --- a/source/blender/editors/include/ED_fluidsim.h +++ b/source/blender/editors/include/ED_fluidsim.h @@ -48,9 +48,4 @@ void fluidsimSettingsFree(struct FluidsimSettings* sb); /* duplicate internal data */ struct FluidsimSettings* fluidsimSettingsCopy(struct FluidsimSettings* sb); -/* memory estimate */ -void fluidsimEstimateMemory(struct Object *ob, struct FluidsimSettings *fs, char *value); - #endif /* ED_FLUIDSIM_H */ - - diff --git a/source/blender/editors/include/ED_logic.h b/source/blender/editors/include/ED_logic.h index e6026eb5fee..ce1f2b8faac 100644 --- a/source/blender/editors/include/ED_logic.h +++ b/source/blender/editors/include/ED_logic.h @@ -34,6 +34,3 @@ void ED_operatortypes_logic(void); #endif /* ED_LOGIC_H */ - - - diff --git a/source/blender/editors/include/ED_particle.h b/source/blender/editors/include/ED_particle.h index 48232acf562..3035aa44735 100644 --- a/source/blender/editors/include/ED_particle.h +++ b/source/blender/editors/include/ED_particle.h @@ -51,7 +51,7 @@ int PE_start_edit(struct PTCacheEdit *edit); struct PTCacheEdit *PE_get_current(struct Scene *scene, struct Object *ob); struct PTCacheEdit *PE_create_current(struct Scene *scene, struct Object *ob); void PE_current_changed(struct Scene *scene, struct Object *ob); -int PE_minmax(struct Scene *scene, float *min, float *max); +int PE_minmax(struct Scene *scene, float min[3], float max[3]); struct ParticleEditSettings *PE_settings(struct Scene *scene); /* update calls */ @@ -72,7 +72,7 @@ void PE_undo(struct Scene *scene); void PE_redo(struct Scene *scene); int PE_undo_valid(struct Scene *scene); void PE_undo_number(struct Scene *scene, int nr); -char *PE_undo_get_name(struct Scene *scene, int nr, int *active); +const char *PE_undo_get_name(struct Scene *scene, int nr, int *active); #endif /* ED_PARTICLE_H */ diff --git a/source/blender/editors/include/ED_space_api.h b/source/blender/editors/include/ED_space_api.h index 8e445ab1cee..b5a1ca193db 100644 --- a/source/blender/editors/include/ED_space_api.h +++ b/source/blender/editors/include/ED_space_api.h @@ -54,6 +54,7 @@ void ED_spacetype_sequencer(void); void ED_spacetype_logic(void); void ED_spacetype_console(void); void ED_spacetype_userpref(void); +void ED_spacetype_clip(void); /* calls for instancing and freeing spacetype static data called in WM_init_exit */ diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h index c644b1d27b4..37f647abfd9 100644 --- a/source/blender/editors/include/ED_transform.h +++ b/source/blender/editors/include/ED_transform.h @@ -94,6 +94,7 @@ enum { #define CTX_AUTOCONFIRM 32 #define CTX_BMESH 64 #define CTX_NDOF 128 +#define CTX_MOVIECLIP 256 /* Standalone call to get the transformation center corresponding to the current situation * returns 1 if successful, 0 otherwise (usually means there's no selection) @@ -107,10 +108,12 @@ struct Base; struct Scene; struct Object; +#if 0 /* UNUSED, deprecate? */ void BIF_setSingleAxisConstraint(float vec[3], char *text); void BIF_setDualAxisConstraint(float vec1[3], float vec2[3], char *text); void BIF_setLocalAxisConstraint(char axis, char *text); void BIF_setLocalLockConstraint(char axis, char *text); +#endif int BIF_snappingSupported(struct Object *obedit); @@ -132,7 +135,7 @@ struct EnumPropertyItem *BIF_enumTransformOrientation(struct bContext *C); const char * BIF_menustringTransformOrientation(const struct bContext *C, const char *title); /* the returned value was allocated and needs to be freed after use */ int BIF_countTransformOrientation(const struct bContext *C); -void BIF_TransformSetUndo(char *str); +void BIF_TransformSetUndo(const char *str); void BIF_selectOrientation(void); diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h index f69abb0996a..82a1e6f1f00 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -130,7 +130,6 @@ void ED_view3d_win_to_segment_clip(struct ARegion *ar, struct View3D *v3d, const * In orthographic view the resulting ray_normal will match the view vector. * @param ar The region (used for the window width and height). * @param v3d The 3d viewport (used for near clipping value). - * @param out The resulting normalized world-space direction vector. * @param mval The area relative 2d location (such as event->mval, converted into float[2]). * @param ray_start The world-space starting point of the segment. * @param ray_normal The normalized world-space direction of towards mval. @@ -140,7 +139,7 @@ void ED_view3d_win_to_ray(struct ARegion *ar, struct View3D *v3d, const float mv /** * Calculate a normalized 3d direction vector from the viewpoint towards a global location. * In orthographic view the resulting vector will match the view vector. - * @param ar The region (used for the window width and height). + * @param rv3d The region (used for the window width and height). * @param coord The world-space location. * @param vec The resulting normalized vector. */ @@ -171,6 +170,7 @@ void ED_view3d_from_m4(float mat[][4], float ofs[3], float quat[4], float *dist) * @param ofs The view offset to be set, normally from RegionView3D.ofs. * @param quat The view rotation to be set, quaternion normally from RegionView3D.viewquat. * @param dist The view distance from ofs to be set, normally from RegionView3D.dist. + * @param lens The view lens angle set for cameras and lamps, normally from View3D.lens. */ void ED_view3d_from_object(struct Object *ob, float ofs[3], float quat[4], float *dist, float *lens); @@ -290,4 +290,6 @@ void ED_view3d_camera_lock_init(struct View3D *v3d, struct RegionView3D *rv3d); /* copy the view to the camera, return TRUE if */ int ED_view3d_camera_lock_sync(struct View3D *v3d, struct RegionView3D *rv3d); +struct BGpic *ED_view3D_background_image_add(struct View3D *v3d); + #endif /* ED_VIEW3D_H */ diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index 8cb37ab337d..c7afe2fb28f 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -173,6 +173,7 @@ DEF_ICON(NODETREE) DEF_ICON(LOGIC) DEF_ICON(CONSOLE) DEF_ICON(PREFERENCES) +DEF_ICON(CLIP) DEF_ICON(ASSET_MANAGER) #ifndef DEF_ICON_BLANK_SKIP DEF_ICON(BLANK057) @@ -180,7 +181,6 @@ DEF_ICON(ASSET_MANAGER) DEF_ICON(BLANK059) DEF_ICON(BLANK060) DEF_ICON(BLANK061) - DEF_ICON(BLANK061b) #endif /* MODES */ @@ -642,6 +642,8 @@ DEF_ICON(DRIVER) /* ANIMATION */ DEF_ICON(SOLO_OFF) DEF_ICON(SOLO_ON) +DEF_ICON(FRAME_PREV) +DEF_ICON(FRAME_NEXT) #ifndef DEF_ICON_BLANK_SKIP /* available */ DEF_ICON(BLANK186) @@ -666,8 +668,6 @@ DEF_ICON(SOLO_ON) DEF_ICON(BLANK205) DEF_ICON(BLANK206) DEF_ICON(BLANK207) - DEF_ICON(BLANK208) - DEF_ICON(BLANK208b) #endif /* EDITING */ diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index 5dc63c24e39..677ec0ae9bd 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -227,18 +227,19 @@ typedef struct uiLayout uiLayout; #define TOGBUT (37<<9) #define OPTION (38<<9) #define OPTIONN (39<<9) +#define TRACKPREVIEW (40<<9) /* buttons with value >= SEARCH_MENU don't get undo pushes */ -#define SEARCH_MENU (40<<9) -#define BUT_EXTRA (41<<9) -#define HSVCIRCLE (42<<9) -#define LISTBOX (43<<9) -#define LISTROW (44<<9) -#define HOTKEYEVT (45<<9) -#define BUT_IMAGE (46<<9) -#define HISTOGRAM (47<<9) -#define WAVEFORM (48<<9) -#define VECTORSCOPE (49<<9) -#define PROGRESSBAR (50<<9) +#define SEARCH_MENU (41<<9) +#define BUT_EXTRA (42<<9) +#define HSVCIRCLE (43<<9) +#define LISTBOX (44<<9) +#define LISTROW (45<<9) +#define HOTKEYEVT (46<<9) +#define BUT_IMAGE (47<<9) +#define HISTOGRAM (48<<9) +#define WAVEFORM (49<<9) +#define VECTORSCOPE (50<<9) +#define PROGRESSBAR (51<<9) #define BUTTYPE (63<<9) @@ -511,8 +512,6 @@ uiBut *uiDefHotKeyevtButS(uiBlock *block, int retval, const char *str, int x1, i uiBut *uiDefSearchBut(uiBlock *block, void *arg, int retval, int icon, int maxlen, int x1, int y1, short x2, short y2, float a1, float a2, const char *tip); -void uiBlockPickerButtons(struct uiBlock *block, float *col, float *hsv, float *old, char *hexcol, char mode, short retval); - uiBut *uiDefAutoButR(uiBlock *block, struct PointerRNA *ptr, struct PropertyRNA *prop, int index, const char *name, int icon, int x1, int y1, int x2, int y2); int uiDefAutoButsRNA(uiLayout *layout, struct PointerRNA *ptr, int (*check_prop)(struct PropertyRNA *), const char label_align); @@ -761,6 +760,10 @@ void uiTemplateNodeView(uiLayout *layout, struct bContext *C, struct bNodeTree * void uiTemplateTextureUser(uiLayout *layout, struct bContext *C); void uiTemplateTextureShow(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop); +void uiTemplateMovieClip(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, const char *propname, int compact); +void uiTemplateTrack(struct uiLayout *layout, struct PointerRNA *ptr, const char *propname); +void uiTemplateMarker(struct uiLayout *layout, struct PointerRNA *ptr, const char *propname, PointerRNA *userptr, PointerRNA *trackptr, int cmpact); + /* items */ void uiItemO(uiLayout *layout, const char *name, int icon, const char *opname); void uiItemEnumO(uiLayout *layout, const char *opname, const char *name, int icon, const char *propname, int value); diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index 9c46a5d28de..4b1371c532c 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -247,7 +247,18 @@ enum { TH_DRAWEXTRA_FACEAREA, TH_DRAWEXTRA_FACEANG, - TH_NODE_CURVING + TH_NODE_CURVING, + + TH_MARKER_OUTLINE, + TH_MARKER, + TH_ACT_MARKER, + TH_SEL_MARKER, + TH_BUNDLE_SOLID, + TH_DIS_MARKER, + TH_PATH_BEFORE, + TH_PATH_AFTER, + TH_CAMERA_PATH, + TH_LOCK_MARKER }; /* XXX WARNING: previous is saved in file, so do not change order! */ |