1 files changed, 12 insertions, 65 deletions

diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index b6680d8560f..340184845b8 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -383,7 +383,6 @@ bool ED_node_is_texture(struct SpaceNode *snode)
 /* called from shading buttons or header */
 void ED_node_shader_default(const bContext *C, ID *id)
 {
-	Scene *scene = CTX_data_scene(C);
 	bNode *in, *out;
 	bNodeSocket *fromsock, *tosock, *sock;
 	bNodeTree *ntree;
@@ -398,18 +397,8 @@ void ED_node_shader_default(const bContext *C, ID *id)
 			Material *ma = (Material *)id;
 			ma->nodetree = ntree;
 
-			if (BKE_scene_uses_blender_eevee(scene)) {
-				output_type = SH_NODE_OUTPUT_MATERIAL;
-				shader_type = SH_NODE_BSDF_PRINCIPLED;
-			}
-			else if (BKE_scene_use_new_shading_nodes(scene)) {
-				output_type = SH_NODE_OUTPUT_MATERIAL;
-				shader_type = SH_NODE_BSDF_DIFFUSE;
-			}
-			else {
-				output_type = SH_NODE_OUTPUT;
-				shader_type = SH_NODE_MATERIAL;
-			}
+			output_type = SH_NODE_OUTPUT_MATERIAL;
+			shader_type = SH_NODE_BSDF_PRINCIPLED;
 
 			copy_v3_v3(color, &ma->r);
 			strength = 0.0f;
@@ -460,18 +449,16 @@ void ED_node_shader_default(const bContext *C, ID *id)
 	nodeAddLink(ntree, in, fromsock, out, tosock);
 
 	/* default values */
-	if (BKE_scene_use_new_shading_nodes(scene)) {
-		PointerRNA sockptr;
-		sock = in->inputs.first;
-		RNA_pointer_create((ID *)ntree, &RNA_NodeSocket, sock, &sockptr);
-		
-		RNA_float_set_array(&sockptr, "default_value", color);
+	PointerRNA sockptr;
+	sock = in->inputs.first;
+	RNA_pointer_create((ID *)ntree, &RNA_NodeSocket, sock, &sockptr);
+	
+	RNA_float_set_array(&sockptr, "default_value", color);
 
-		if (strength != 0.0f) {
-			sock = in->inputs.last;
-			RNA_pointer_create((ID *)ntree, &RNA_NodeSocket, sock, &sockptr);
-			RNA_float_set(&sockptr, "default_value", strength);
-		}
+	if (strength != 0.0f) {
+		sock = in->inputs.last;
+		RNA_pointer_create((ID *)ntree, &RNA_NodeSocket, sock, &sockptr);
+		RNA_float_set(&sockptr, "default_value", strength);
 	}
 	
 	ntreeUpdateTree(CTX_data_main(C), ntree);
@@ -550,12 +537,6 @@ void snode_set_context(const bContext *C)
 	bNodeTree *ntree = snode->nodetree;
 	ID *id = snode->id, *from = snode->from;
 	
-	/* we use this to signal warnings, when node shaders are drawn in wrong render engine */
-	if (BKE_scene_use_new_shading_nodes(CTX_data_scene(C)))
-		snode->flag |= SNODE_NEW_SHADERS;
-	else
-		snode->flag &= ~SNODE_NEW_SHADERS;
-	
 	/* check the tree type */
 	if (!treetype ||
 	    (treetype->poll && !treetype->poll(C, treetype)))
@@ -643,7 +624,7 @@ void ED_node_set_active(Main *bmain, bNodeTree *ntree, bNode *node)
 			if (node->id && ELEM(GS(node->id->name), ID_MA, ID_LA, ID_WO))
 				nodeClearActiveID(ntree, ID_TE);
 			
-			if (ELEM(node->type, SH_NODE_OUTPUT, SH_NODE_OUTPUT_MATERIAL,
+			if (ELEM(node->type, SH_NODE_OUTPUT_MATERIAL,
 			         SH_NODE_OUTPUT_WORLD, SH_NODE_OUTPUT_LAMP, SH_NODE_OUTPUT_LINESTYLE))
 			{
 				bNode *tnode;
@@ -1321,40 +1302,6 @@ void NODE_OT_read_viewlayers(wmOperatorType *ot)
 	ot->flag = 0;
 }
 
-static int node_read_fullsamplelayers_exec(bContext *C, wmOperator *UNUSED(op))
-{
-	Main *bmain = CTX_data_main(C);
-	SpaceNode *snode = CTX_wm_space_node(C);
-	Scene *curscene = CTX_data_scene(C);
-	Render *re = RE_NewSceneRender(curscene);
-
-	WM_cursor_wait(1);
-	RE_MergeFullSample(re, bmain, curscene, snode->nodetree);
-	WM_cursor_wait(0);
-
-	/* note we are careful to send the right notifier, as otherwise the
-	 * compositor would reexecute and overwrite the full sample result */
-	WM_event_add_notifier(C, NC_SCENE | ND_COMPO_RESULT, NULL);
-
-	return OPERATOR_FINISHED;
-}
-
-
-void NODE_OT_read_fullsamplelayers(wmOperatorType *ot)
-{
-	
-	ot->name = "Read Full Sample Layers";
-	ot->idname = "NODE_OT_read_fullsamplelayers";
-	ot->description = "Read all render layers of current scene, in full sample";
-	
-	ot->exec = node_read_fullsamplelayers_exec;
-	
-	ot->poll = composite_node_active;
-	
-	/* flags */
-	ot->flag = 0;
-}
-
 int node_render_changed_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Scene *sce = CTX_data_scene(C);