1 files changed, 9 insertions, 84 deletions

diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index 2de1050e167..06f62f5a5dc 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -89,7 +89,7 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render *re, int render_count) : Str
 	freestyle_scene = BKE_scene_add(freestyle_bmain, name);
 	freestyle_scene->r.cfra = old_scene->r.cfra;
 	freestyle_scene->r.mode = old_scene->r.mode &
-	                          ~(R_EDGE_FRS | R_SHADOW | R_SSS | R_PANORAMA | R_ENVMAP | R_MBLUR | R_BORDER);
+	                          ~(R_EDGE_FRS | R_PANORAMA | R_MBLUR | R_BORDER);
 	freestyle_scene->r.xsch = re->rectx; // old_scene->r.xsch
 	freestyle_scene->r.ysch = re->recty; // old_scene->r.ysch
 	freestyle_scene->r.xasp = 1.0f; // old_scene->r.xasp;
@@ -97,8 +97,6 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render *re, int render_count) : Str
 	freestyle_scene->r.tilex = old_scene->r.tilex;
 	freestyle_scene->r.tiley = old_scene->r.tiley;
 	freestyle_scene->r.size = 100; // old_scene->r.size
-	//freestyle_scene->r.maximsize = old_scene->r.maximsize; /* DEPRECATED */
-	freestyle_scene->r.ocres = old_scene->r.ocres;
 	freestyle_scene->r.color_mgt_flag = 0; // old_scene->r.color_mgt_flag;
 	freestyle_scene->r.scemode = old_scene->r.scemode & ~(R_SINGLE_LAYER | R_NO_FRAME_UPDATE | R_MULTIVIEW);
 	freestyle_scene->r.flag = old_scene->r.flag;
@@ -112,9 +110,6 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render *re, int render_count) : Str
 	freestyle_scene->r.safety.ymin = old_scene->r.safety.ymin;
 	freestyle_scene->r.safety.xmax = old_scene->r.safety.xmax;
 	freestyle_scene->r.safety.ymax = old_scene->r.safety.ymax;
-	freestyle_scene->r.osa = old_scene->r.osa;
-	freestyle_scene->r.filtertype = old_scene->r.filtertype;
-	freestyle_scene->r.gauss = old_scene->r.gauss;
 	freestyle_scene->r.dither_intensity = old_scene->r.dither_intensity;
 	STRNCPY(freestyle_scene->r.engine, old_scene->r.engine);
 	if (G.debug & G_DEBUG_FREESTYLE) {
@@ -167,14 +162,8 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render *re, int render_count) : Str
 	// Reset serial mesh ID (used for BlenderStrokeRenderer::NewMesh())
 	_mesh_id = 0xffffffff;
 
-	// Check if the rendering engine uses new shading nodes
-	_use_shading_nodes = BKE_scene_use_new_shading_nodes(freestyle_scene);
-
 	// Create a bNodeTree-to-Material hash table
-	if (_use_shading_nodes)
-		_nodetree_hash = BLI_ghash_ptr_new("BlenderStrokeRenderer::_nodetree_hash");
-	else
-		_nodetree_hash = NULL;
+	_nodetree_hash = BLI_ghash_ptr_new("BlenderStrokeRenderer::_nodetree_hash");
 
 	// Depsgraph
 	freestyle_depsgraph = DEG_graph_new(freestyle_scene, view_layer, DAG_EVAL_RENDER);
@@ -230,21 +219,11 @@ BlenderStrokeRenderer::~BlenderStrokeRenderer()
 	while (lnk)
 	{
 		Material *ma = (Material*)lnk;
-		// We want to retain the linestyle mtexs, so let's detach them first
-		for (int a = 0; a < MAX_MTEX; a++) {
-			if (ma->mtex[a]) {
-				ma->mtex[a] = NULL;
-			}
-			else {
-				break; // Textures are ordered, no empty slots between two textures
-			}
-		}
 		lnk = lnk->next;
 		BKE_libblock_free(freestyle_bmain, ma);
 	}
 
-	if (_use_shading_nodes)
-		BLI_ghash_free(_nodetree_hash, NULL, NULL);
+	BLI_ghash_free(_nodetree_hash, NULL, NULL);
 
 	DEG_graph_free(freestyle_depsgraph);
 
@@ -488,67 +467,13 @@ void BlenderStrokeRenderer::RenderStrokeRep(StrokeRep *iStrokeRep) const
 
 void BlenderStrokeRenderer::RenderStrokeRepBasic(StrokeRep *iStrokeRep) const
 {
-	if (_use_shading_nodes) {
-		bNodeTree *nt = iStrokeRep->getNodeTree();
-		Material *ma = (Material *)BLI_ghash_lookup(_nodetree_hash, nt);
-		if (!ma) {
-			ma = BlenderStrokeRenderer::GetStrokeShader(freestyle_bmain, nt, false);
-			BLI_ghash_insert(_nodetree_hash, nt, ma);
-		}
-		iStrokeRep->setMaterial(ma);
-	}
-	else {
-		bool has_mat = false;
-		int a = 0;
-
-		// Look for a good existing material
-		for (Link *lnk = (Link *)freestyle_bmain->mat.first; lnk; lnk = lnk->next) {
-			Material *ma = (Material*)lnk;
-			bool texs_are_good = true;
-			// as soon as textures differ it's not the right one
-			for (int a = 0; a < MAX_MTEX; a++) {
-				if (ma->mtex[a] != iStrokeRep->getMTex(a)) {
-					texs_are_good = false;
-					break;
-				}
-			}
-
-			if (texs_are_good) {
-				iStrokeRep->setMaterial(ma);
-				has_mat = true;
-				break; // if textures are good, no need to search anymore
-			}
-		}
-
-		// If still no material, create one
-		if (!has_mat) {
-			Material *ma = BKE_material_add(freestyle_bmain, "stroke_material");
-			DEG_relations_tag_update(freestyle_bmain);
-			ma->mode |= MA_VERTEXCOLP;
-			ma->mode |= MA_TRANSP;
-			ma->mode |= MA_SHLESS;
-			ma->vcol_alpha = 1;
-
-			id_us_min(&ma->id);
-
-			// Textures
-			while (iStrokeRep->getMTex(a)) {
-				ma->mtex[a] = (MTex *)iStrokeRep->getMTex(a);
-
-				// We'll generate both with tips and without tips
-				// coordinates, on two different UV layers.
-				if (ma->mtex[a]->texflag & MTEX_TIPS) {
-					BLI_strncpy(ma->mtex[a]->uvname, uvNames[1], sizeof(ma->mtex[a]->uvname));
-				}
-				else {
-					BLI_strncpy(ma->mtex[a]->uvname, uvNames[0], sizeof(ma->mtex[a]->uvname));
-				}
-				a++;
-			}
-
-			iStrokeRep->setMaterial(ma);
-		}
+	bNodeTree *nt = iStrokeRep->getNodeTree();
+	Material *ma = (Material *)BLI_ghash_lookup(_nodetree_hash, nt);
+	if (!ma) {
+		ma = BlenderStrokeRenderer::GetStrokeShader(freestyle_bmain, nt, false);
+		BLI_ghash_insert(_nodetree_hash, nt, ma);
 	}
+	iStrokeRep->setMaterial(ma);
 
 	const vector<Strip*>& strips = iStrokeRep->getStrips();
 	const bool hasTex = iStrokeRep->hasTex();