Added support for animation of line style parameters.

Most stylization parameters in line style datablocks are now
animatable by means of keyframes.  Right click on a line
style parameter, and you will see a list of keyframe-related
commands in the context menu.

Concerning the implementation, RNA path resolution has been
extended to properly address color ramps in line style color
modifiers.  File I/O has been also improved to load/save the
animation data associated with line style datablocks.

Known issue: Freestyle-related options in render layers are
not animatable at the moment, because of general inability (or
maybe a bug) that keyframes cannot be inserted with respect to
render layer options.

3 files changed, 61 insertions, 0 deletions

diff --git a/source/blender/blenkernel/BKE_linestyle.h b/source/blender/blenkernel/BKE_linestyle.h
index 0514cb73e5b..2e68ab38ecd 100644
--- a/source/blender/blenkernel/BKE_linestyle.h
+++ b/source/blender/blenkernel/BKE_linestyle.h
@@ -55,4 +55,7 @@ void FRS_move_linestyle_color_modifier(FreestyleLineStyle *linestyle, LineStyleM
 void FRS_move_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier, int direction);
 void FRS_move_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier, int direction);
 
+void FRS_list_modifier_color_ramps(FreestyleLineStyle *linestyle, ListBase *listbase);
+char *FRS_path_from_ID_to_color_ramp(FreestyleLineStyle *linestyle, ColorBand *color_ramp);
+
 #endif
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 28eed5a27e8..e58526cae0f 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -75,6 +75,7 @@ short id_type_can_have_animdata (ID *id)
 		case ID_PA:
 		case ID_MA: case ID_TE: case ID_NT:
 		case ID_LA: case ID_CA: case ID_WO:
+		case ID_LS:
 		case ID_SCE:
 		{
 			return 1;
diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c
index acd8f0e4368..ef4ce16328f 100644
--- a/source/blender/blenkernel/intern/linestyle.c
+++ b/source/blender/blenkernel/intern/linestyle.c
@@ -34,6 +34,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "DNA_material_types.h" /* for ramp blend */
+#include "DNA_texture_types.h"
 
 #include "BKE_global.h"
 #include "BKE_library.h"
@@ -41,6 +42,7 @@
 #include "BKE_main.h"
 #include "BKE_texture.h"
 #include "BKE_colortools.h"
+#include "BKE_animsys.h"
 
 #include "BLI_blenlib.h"
 
@@ -80,6 +82,7 @@ void FRS_free_linestyle(FreestyleLineStyle *linestyle)
 {
 	LineStyleModifier *m;
 
+	BKE_free_animdata(&linestyle->id);
 	while ((m = (LineStyleModifier *)linestyle->color_modifiers.first))
 		FRS_remove_linestyle_color_modifier(linestyle, m);
 	while ((m = (LineStyleModifier *)linestyle->alpha_modifiers.first))
@@ -308,3 +311,57 @@ void FRS_move_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, LineSt
 {
 	move_modifier(&linestyle->thickness_modifiers, modifier, direction);
 }
+
+void FRS_list_modifier_color_ramps(FreestyleLineStyle *linestyle, ListBase *listbase)
+{
+	LineStyleModifier *m;
+	ColorBand *color_ramp;
+	LinkData *link;
+
+	listbase->first = listbase->last = NULL;
+	for (m = (LineStyleModifier *)linestyle->color_modifiers.first; m; m = m->next) {
+		switch (m->type) {
+		case LS_MODIFIER_ALONG_STROKE:
+			color_ramp = ((LineStyleColorModifier_AlongStroke *)m)->color_ramp;
+			break;
+		case LS_MODIFIER_DISTANCE_FROM_CAMERA:
+			color_ramp = ((LineStyleColorModifier_DistanceFromCamera *)m)->color_ramp;
+			break;
+		case LS_MODIFIER_DISTANCE_FROM_OBJECT:
+			color_ramp = ((LineStyleColorModifier_DistanceFromObject *)m)->color_ramp;
+			break;
+		default:
+			continue;
+		}
+		link = (LinkData *) MEM_callocN( sizeof(LinkData), "link to color ramp");
+		link->data = color_ramp;
+		BLI_addtail(listbase, link);
+	}
+}
+
+char *FRS_path_from_ID_to_color_ramp(FreestyleLineStyle *linestyle, ColorBand *color_ramp)
+{
+	LineStyleModifier *m;
+
+	for (m = (LineStyleModifier *)linestyle->color_modifiers.first; m; m = m->next) {
+		switch (m->type) {
+		case LS_MODIFIER_ALONG_STROKE:
+			if (color_ramp == ((LineStyleColorModifier_AlongStroke *)m)->color_ramp)
+				goto found;
+			break;
+		case LS_MODIFIER_DISTANCE_FROM_CAMERA:
+			if (color_ramp == ((LineStyleColorModifier_DistanceFromCamera *)m)->color_ramp)
+				goto found;
+			break;
+		case LS_MODIFIER_DISTANCE_FROM_OBJECT:
+			if (color_ramp == ((LineStyleColorModifier_DistanceFromObject *)m)->color_ramp)
+				goto found;
+			break;
+		}
+	}
+	printf("FRS_path_from_ID_to_color_ramp: No color ramps correspond to the given pointer.\n");
+	return NULL;
+
+found:
+	return BLI_sprintfN("color_modifiers[\"%s\"].color_ramp", m->name);
+}