diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-07-01 15:00:17 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-07-01 15:00:17 +0300 |
| commit | c6b042be9ef3e0a46a52dde2c06cc570bfbe66cc (patch) | |
| tree | 8c1204cd7c7f3ebb32a54b3da2a633845625db11 | |
| parent | cb1777d3b6b37670c3522791d7b36c58029cf58d (diff) | |
Accidentally marked as 'rc'v2.75
| -rw-r--r-- | source/blender/blenkernel/BKE_blender.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/animation/anim_markers.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index b7b54c8bb7a..f7071a3f4bb 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -51,7 +51,7 @@ extern "C" { /* can be left blank, otherwise a,b,c... etc with no quotes */ #define BLENDER_VERSION_CHAR /* alpha/beta/rc/release, docs use this */ -#define BLENDER_VERSION_CYCLE rc +#define BLENDER_VERSION_CYCLE release extern char versionstr[]; /* from blender.c */ diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index a13a901fdc2..67839d11722 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -520,7 +520,6 @@ static int ed_markers_poll_selected_no_locked_markers(bContext *C) static int ed_markers_poll_markers_exist(bContext *C) { ListBase *markers = ED_context_get_markers(C); - ToolSettings *ts = CTX_data_tool_settings(C); /* first things first: markers can only exist in timeline views */ if (ED_operator_animview_active(C) == 0) |