3 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/blenlib/BLI_editVert.h b/source/blender/blenlib/BLI_editVert.h
index ad36f86ea0f..ffe1d7e2b6e 100644
--- a/source/blender/blenlib/BLI_editVert.h
+++ b/source/blender/blenlib/BLI_editVert.h
@@ -100,7 +100,7 @@ typedef struct EditEdge
 		float			fp;
 	} tmp;
 	short f1, f2;	/* short, f1 is (ab)used in subdiv */
-	unsigned char f, h, dir, seam, sharp;
+	unsigned char f, h, dir, seam, sharp, freestyle;
 	float crease;
 	float bweight;
 	short fast; 		/* only 0 or 1, for editmesh_fastmalloc */
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 5d54ffbeb36..a424c2ac169 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -36,6 +36,7 @@ set(INC
 set(INC_SYS
 	${ZLIB_INCLUDE_DIRS}
 	${FREETYPE_INCLUDE_DIRS}
+	${ZLIB_INC}
 )
 
 set(SRC
diff --git a/source/blender/blenlib/intern/bpath.c b/source/blender/blenlib/intern/bpath.c
index 8ad6cfc7cdf..80a5421aff3 100644
--- a/source/blender/blenlib/intern/bpath.c
+++ b/source/blender/blenlib/intern/bpath.c
@@ -67,6 +67,7 @@
 #include "DNA_vfont_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_smoke_types.h"
+#include "DNA_freestyle_types.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_bpath.h"
@@ -489,6 +490,7 @@ void bpath_traverse_id(Main *bmain, ID *id, BPathVisitor visit_cb, const int fla
 	case ID_SCE:
 		{
 			Scene *scene= (Scene *)id;
+			SceneRenderLayer *srl= scene->r.layers.first;
 			if (scene->ed) {
 				Sequence *seq;
 
@@ -524,6 +526,12 @@ void bpath_traverse_id(Main *bmain, ID *id, BPathVisitor visit_cb, const int fla
 				}
 				SEQ_END
 			}
+			for(; srl; srl= srl->next) {
+				FreestyleModuleConfig* module= srl->freestyleConfig.modules.first;
+				for (; module; module= module->next) {
+					rewrite_path_fixed(module->module_path, visit_cb, absbase, bpath_user_data);
+				}
+			}
 		}
 		break;
 	case ID_ME: