[Bf-blender-cvs] [86c55a1] master: Fix T47492: Name is not displayed for newly renamed FCurve, when the path was broken

Joshua Leung noreply at git.blender.org
Sat Feb 20 05:57:53 CET 2016


Commit: 86c55a18e5f09f2cb46f2bfe27b6956dccc86b20
Author: Joshua Leung
Date:   Sat Feb 20 17:01:27 2016 +1300
Branches: master
https://developer.blender.org/rB86c55a18e5f09f2cb46f2bfe27b6956dccc86b20

Fix T47492: Name is not displayed for newly renamed FCurve, when the path was broken

Thanks Alexander Romanov (a.romanov) for the fix!

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

M	source/blender/editors/animation/anim_channels_defines.c

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

diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index 05e9b89..95354bc 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -4259,6 +4259,13 @@ void ANIM_channel_draw_widgets(const bContext *C, bAnimContext *ac, bAnimListEle
 			
 			UI_block_emboss_set(block, UI_EMBOSS_NONE);
 		}
+		else {
+			/* Cannot get property/cannot or rename for some reason, so clear rename index
+			 * so that this doesn't hang around, and the name can be drawn normally - T47492
+			 */
+			ac->ads->renameIndex = 0;
+			WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN, NULL);
+		}
 	}
 	
 	/* step 5) draw mute+protection toggles + (sliders) ....................... */




More information about the Bf-blender-cvs mailing list