[Bf-blender-cvs] [c6b042b] blender-v2.75-release: Accidentally marked as 'rc'

Campbell Barton noreply at git.blender.org
Wed Jul 1 14:04:52 CEST 2015


Commit: c6b042be9ef3e0a46a52dde2c06cc570bfbe66cc
Author: Campbell Barton
Date:   Wed Jul 1 22:00:17 2015 +1000
Branches: blender-v2.75-release
https://developer.blender.org/rBc6b042be9ef3e0a46a52dde2c06cc570bfbe66cc

Accidentally marked as 'rc'

===================================================================

M	source/blender/blenkernel/BKE_blender.h
M	source/blender/editors/animation/anim_markers.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h
index b7b54c8..f7071a3 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 a13a901..67839d1 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)




More information about the Bf-blender-cvs mailing list