1 files changed, 22 insertions, 20 deletions

diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
index 45da59e9215..b1c5de9d621 100644
--- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
+++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
@@ -58,12 +58,12 @@ extern "C" {
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_math_color_blend.h"
 #include "BLI_callbacks.h"
 
 #include "BPY_extern.h"
 
 #include "renderpipeline.h"
-#include "pixelblending.h"
 
 #include "FRS_freestyle.h"
 
@@ -283,19 +283,19 @@ static bool test_edge_type_conditions(struct edge_type_condition *conditions,
 	return true;
 }
 
-static void prepare(Render *re, SceneRenderLayer *srl)
+static void prepare(Render *re, ViewLayer *view_layer)
 {
 	// load mesh
 	re->i.infostr = IFACE_("Freestyle: Mesh loading");
 	re->stats_draw(re->sdh, &re->i);
 	re->i.infostr = NULL;
-	if (controller->LoadMesh(re, srl)) // returns if scene cannot be loaded or if empty
+	if (controller->LoadMesh(re, view_layer)) // returns if scene cannot be loaded or if empty
 		return;
 	if (re->test_break(re->tbh))
 		return;
 
 	// add style modules
-	FreestyleConfig *config = &srl->freestyleConfig;
+	FreestyleConfig *config = &view_layer->freestyle_config;
 
 	if (G.debug & G_DEBUG_FREESTYLE) {
 		cout << "\n===  Rendering options  ===" << endl;
@@ -359,7 +359,7 @@ static void prepare(Render *re, SceneRenderLayer *srl)
 					cout << "  " << layer_count+1 << ": " << lineset->name << " - " <<
 					        (lineset->linestyle ? (lineset->linestyle->id.name + 2) : "<NULL>") << endl;
 				}
-				char *buffer = create_lineset_handler(srl->name, lineset->name);
+				char *buffer = create_lineset_handler(view_layer->name, lineset->name);
 				controller->InsertStyleModule(layer_count, lineset->name, buffer);
 				controller->toggleLayer(layer_count, true);
 				MEM_freeN(buffer);
@@ -445,7 +445,7 @@ static void prepare(Render *re, SceneRenderLayer *srl)
 	}
 
 	// set diffuse and z depth passes
-	RenderLayer *rl = RE_GetRenderLayer(re->result, srl->name);
+	RenderLayer *rl = RE_GetRenderLayer(re->result, view_layer->name);
 	bool diffuse = false, z = false;
 	for (RenderPass *rpass = (RenderPass *)rl->passes.first; rpass; rpass = rpass->next) {
 		if (STREQ(rpass->name, RE_PASSNAME_DIFFUSE)) {
@@ -473,7 +473,7 @@ static void prepare(Render *re, SceneRenderLayer *srl)
 	controller->ComputeViewMap();
 }
 
-void FRS_composite_result(Render *re, SceneRenderLayer *srl, Render *freestyle_render)
+void FRS_composite_result(Render *re, ViewLayer *view_layer, Render *freestyle_render)
 {
 	RenderLayer *rl;
 	float *src, *dest, *pixSrc, *pixDest;
@@ -503,7 +503,7 @@ void FRS_composite_result(Render *re, SceneRenderLayer *srl, Render *freestyle_r
 	}
 #endif
 
-	rl = RE_GetRenderLayer(re->result, srl->name);
+	rl = RE_GetRenderLayer(re->result, view_layer->name);
 	if (!rl) {
 		if (G.debug & G_DEBUG_FREESTYLE) {
 			cout << "No destination render layer to composite to" << endl;
@@ -530,19 +530,19 @@ void FRS_composite_result(Render *re, SceneRenderLayer *srl, Render *freestyle_r
 			pixSrc = src + 4 * (rectx * y + x);
 			if (pixSrc[3] > 0.0) {
 				pixDest = dest + 4 * (rectx * y + x);
-				addAlphaOverFloat(pixDest, pixSrc);
+				blend_color_mix_float(pixDest, pixDest, pixSrc);
 			}
 		}
 	}
 }
 
-static int displayed_layer_count(SceneRenderLayer *srl)
+static int displayed_layer_count(ViewLayer *view_layer)
 {
 	int count = 0;
 
-	switch (srl->freestyleConfig.mode) {
+	switch (view_layer->freestyle_config.mode) {
 	case FREESTYLE_CONTROL_SCRIPT_MODE:
-		for (FreestyleModuleConfig *module = (FreestyleModuleConfig *)srl->freestyleConfig.modules.first;
+		for (FreestyleModuleConfig *module = (FreestyleModuleConfig *)view_layer->freestyle_config.modules.first;
 		     module;
 		     module = module->next)
 		{
@@ -551,7 +551,7 @@ static int displayed_layer_count(SceneRenderLayer *srl)
 		}
 		break;
 	case FREESTYLE_CONTROL_EDITOR_MODE:
-		for (FreestyleLineSet *lineset = (FreestyleLineSet *)srl->freestyleConfig.linesets.first;
+		for (FreestyleLineSet *lineset = (FreestyleLineSet *)view_layer->freestyle_config.linesets.first;
 		     lineset;
 		     lineset = lineset->next)
 		{
@@ -563,9 +563,11 @@ static int displayed_layer_count(SceneRenderLayer *srl)
 	return count;
 }
 
-int FRS_is_freestyle_enabled(SceneRenderLayer *srl)
+int FRS_is_freestyle_enabled(ViewLayer *view_layer)
 {
-	return (!(srl->layflag & SCE_LAY_DISABLE) && srl->layflag & SCE_LAY_FRS && displayed_layer_count(srl) > 0);
+	return ((view_layer->flag & VIEW_LAYER_RENDER) &&
+	        (view_layer->flag & VIEW_LAYER_FREESTYLE) &&
+	        displayed_layer_count(view_layer) > 0);
 }
 
 void FRS_init_stroke_renderer(Render *re)
@@ -587,7 +589,7 @@ void FRS_begin_stroke_rendering(Render *re)
 	init_camera(re);
 }
 
-Render *FRS_do_stroke_rendering(Render *re, SceneRenderLayer *srl, int render)
+Render *FRS_do_stroke_rendering(Render *re, ViewLayer *view_layer, int render)
 {
 	Render *freestyle_render = NULL;
 
@@ -596,12 +598,12 @@ Render *FRS_do_stroke_rendering(Render *re, SceneRenderLayer *srl, int render)
 
 	RenderMonitor monitor(re);
 	controller->setRenderMonitor(&monitor);
-	controller->setViewMapCache((srl->freestyleConfig.flags & FREESTYLE_VIEW_MAP_CACHE) ? true : false);
+	controller->setViewMapCache((view_layer->freestyle_config.flags & FREESTYLE_VIEW_MAP_CACHE) ? true : false);
 
 	if (G.debug & G_DEBUG_FREESTYLE) {
 		cout << endl;
 		cout << "----------------------------------------------------------" << endl;
-		cout << "|  " << (re->scene->id.name + 2) << "|" << srl->name << endl;
+		cout << "|  " << (re->scene->id.name + 2) << "|" << view_layer->name << endl;
 		cout << "----------------------------------------------------------" << endl;
 	}
 
@@ -610,7 +612,7 @@ Render *FRS_do_stroke_rendering(Render *re, SceneRenderLayer *srl, int render)
 	//   - add style modules
 	//   - set parameters
 	//   - compute view map
-	prepare(re, srl);
+	prepare(re, view_layer);
 
 	if (re->test_break(re->tbh)) {
 		controller->CloseFile();
@@ -635,7 +637,7 @@ Render *FRS_do_stroke_rendering(Render *re, SceneRenderLayer *srl, int render)
 
 			// composite result
 			if (freestyle_render) {
-				FRS_composite_result(re, srl, freestyle_render);
+				FRS_composite_result(re, view_layer, freestyle_render);
 				RE_FreeRenderResult(freestyle_render->result);
 				freestyle_render->result = NULL;
 			}