[Bf-blender-cvs] [37c7cfd2c6] workspaces: Merge branch 'blender2.8' into workspaces

[Julian Eisel]

Commit: 37c7cfd2c68f333f0ece402ffb431f7300ad54a8
Author: Julian Eisel
Date:   Sat Mar 25 18:11:33 2017 +0100
Branches: workspaces
https://developer.blender.org/rB37c7cfd2c68f333f0ece402ffb431f7300ad54a8

Merge branch 'blender2.8' into workspaces

===================================================================



===================================================================

diff --cc source/blender/editors/space_node/drawnode.c
index 3d860ab429,7b560462a9..d844d4479f
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@@ -1281,11 -1281,8 +1281,8 @@@ static void node_composit_buts_renderla
  	PropertyRNA *prop;
  	const char *layer_name;
  	char scene_name[MAX_ID_NAME - 2];
- 	wmOperatorType *ot = WM_operatortype_find("RENDER_OT_render", 1);
- 
- 	BLI_assert(ot != 0);
  
 -	uiTemplateID(layout, C, ptr, "scene", NULL, NULL, NULL);
 +	uiTemplateID(layout, C, ptr, "scene", NULL, NULL, NULL, NULL, NULL);
  	
  	if (!node->id) return;