diff options
| author | Tianwei Shen <shentianweipku@gmail.com> | 2017-02-14 11:41:09 +0300 |
|---|---|---|
| committer | Tianwei Shen <shentianweipku@gmail.com> | 2017-02-14 11:41:09 +0300 |
| commit | 459d429fec1c007b6a80e792a43cd99c5db2656e (patch) | |
| tree | 9377c449f5b94b2a99195c362667af81af14e7db /source/blender/editors/include | |
| parent | ea7c4f61daf2373e51af3ab8afae08d4b217562c (diff) | |
| parent | 54102ab36eba24977c3a7fa373b95df51e50c123 (diff) | |
Merge branch 'master' into soc-2016-multiview
Diffstat (limited to 'source/blender/editors/include')
| -rw-r--r-- | source/blender/editors/include/ED_transform_snap_object_context.h | 4 | ||||
| -rw-r--r-- | source/blender/editors/include/UI_icons.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/editors/include/ED_transform_snap_object_context.h b/source/blender/editors/include/ED_transform_snap_object_context.h index 7944b434057..6eaae49912c 100644 --- a/source/blender/editors/include/ED_transform_snap_object_context.h +++ b/source/blender/editors/include/ED_transform_snap_object_context.h @@ -65,10 +65,6 @@ struct SnapObjectParams { unsigned int use_object_edit_cage : 1; }; -enum { - SNAP_OBJECT_USE_CACHE = (1 << 0), -}; - typedef struct SnapObjectContext SnapObjectContext; SnapObjectContext *ED_transform_snap_object_context_create( struct Main *bmain, struct Scene *scene, int flag); diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index 8a2111fa6b2..b6d565e4e79 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -653,9 +653,9 @@ DEF_ICON(IPO_BACK) DEF_ICON(IPO_EASE_IN) DEF_ICON(IPO_EASE_OUT) DEF_ICON(IPO_EASE_IN_OUT) +DEF_ICON(NORMALIZE_FCURVES) #ifndef DEF_ICON_BLANK_SKIP /* available */ - DEF_ICON(BLANK203) DEF_ICON(BLANK204) DEF_ICON(BLANK205) DEF_ICON(BLANK206) |