[Bf-blender-cvs] [7d91ef04880] master: Partial fix for T60982: Editable anim settings in linked action.

Bastien Montagne noreply at git.blender.org
Tue Jan 29 21:50:09 CET 2019


Commit: 7d91ef04880b57d92c97c365e41aebbb03686ce3
Author: Bastien Montagne
Date:   Tue Jan 29 21:47:15 2019 +0100
Branches: master
https://developer.blender.org/rB7d91ef04880b57d92c97c365e41aebbb03686ce3

Partial fix for T60982: Editable anim settings in linked action.

This is only partially working, because some bAnimListElem items do not
have any ID pointer set (for wome mysterious reason...), notably the
'group' ones.

Will re-assign to @aligorith for that, this code is rather complicated
and hard to follow (with all those macros ;) ).

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

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 c95da49831a..70850781ced 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -4420,6 +4420,12 @@ static void draw_setting_widget(bAnimContext *ac, bAnimListElem *ale, const bAni
 			}
 		}
 	}
+
+	if ((ale->fcurve_owner_id != NULL && ID_IS_LINKED(ale->fcurve_owner_id)) ||
+	    (ale->id != NULL && ID_IS_LINKED(ale->id)))
+	{
+		UI_but_flag_enable(but, UI_BUT_DISABLED);
+	}
 }
 
 /* Draw UI widgets the given channel */



More information about the Bf-blender-cvs mailing list