[Bf-blender-cvs] [9e59a1f7b5c] soc-2018-hair-shader: Merge branch 'master' into soc-2018-hair-shader

[L. E. Segovia]

Commit: 9e59a1f7b5c0aca666cda737936d9fb5621423f4
Author: L. E. Segovia
Date:   Fri Jun 8 09:49:29 2018 +0000
Branches: soc-2018-hair-shader
https://developer.blender.org/rB9e59a1f7b5c0aca666cda737936d9fb5621423f4

Merge branch 'master' into soc-2018-hair-shader

Week 4's merge: two formatting issues fixed

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



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

diff --cc source/blender/editors/space_node/drawnode.c
index a723eefe568,4d12ebfb16b..b6623e170cd
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@@ -1350,10 -1342,10 +1350,10 @@@ static void node_composit_buts_image(ui
  	RNA_pointer_create((ID *)ptr->id.data, &RNA_ImageUser, node->storage, &iuserptr);
  	uiLayoutSetContextPointer(layout, "image_user", &iuserptr);
  	uiTemplateID(
 -	        layout, C, ptr, "image",
 -	        NULL, "IMAGE_OT_open", NULL, UI_TEMPLATE_ID_FILTER_ALL);
 +			layout, C, ptr, "image",
 +			NULL, "IMAGE_OT_open", NULL, UI_TEMPLATE_ID_FILTER_ALL);
  	if (!node->id) return;
- 	
+ 
  	imaptr = RNA_pointer_get(ptr, "image");
  
  	node_buts_image_user(layout, C, ptr, &imaptr, &iuserptr, true);
@@@ -3117,15 -3109,15 +3117,15 @@@ static void node_file_output_socket_dra
  		const char *imtype_name;
  		uiBlock *block;
  		RNA_pointer_create(&ntree->id, &RNA_NodeOutputFileSlotFile, input, &inputptr);
- 		
+ 
  		uiItemL(row, input->path, ICON_NONE);
- 		
+ 
  		if (!RNA_boolean_get(&inputptr, "use_node_format"))
  			imfptr = RNA_pointer_get(&inputptr, "format");
- 		
+ 
  		imtype_prop = RNA_struct_find_property(&imfptr, "file_format");
  		RNA_property_enum_name((bContext *)C, &imfptr, imtype_prop,
 -		                       RNA_property_enum_get(&imfptr, imtype_prop), &imtype_name);
 +							   RNA_property_enum_get(&imfptr, imtype_prop), &imtype_name);
  		block = uiLayoutGetBlock(row);
  		UI_block_emboss_set(block, UI_EMBOSS_PULLDOWN);
  		uiItemL(row, imtype_name, ICON_NONE);
@@@ -3347,10 -3339,10 +3347,10 @@@ void draw_nodespace_back_pix(const bCon
  				}
  				node = node->next;
  			}
- 			
+ 
  			if ((snode->nodetree->flag & NTREE_VIEWER_BORDER) &&
 -			    viewer_border->xmin < viewer_border->xmax &&
 -			    viewer_border->ymin < viewer_border->ymax)
 +				viewer_border->xmin < viewer_border->xmax &&
 +				viewer_border->ymin < viewer_border->ymax)
  			{
  				rcti pixel_border;
  				UI_ThemeColor(TH_ACTIVE);
@@@ -3453,10 -3445,10 +3453,10 @@@ bool node_link_bezier_points(View2D *v2
  	else {
  		/* always do all three, to prevent data hanging around */
  		BKE_curve_forward_diff_bezier(vec[0][0], vec[1][0], vec[2][0], vec[3][0],
 -		                              coord_array[0] + 0, resol, sizeof(float) * 2);
 +									  coord_array[0] + 0, resol, sizeof(float) * 2);
  		BKE_curve_forward_diff_bezier(vec[0][1], vec[1][1], vec[2][1], vec[3][1],
- 									  coord_array[0] + 1, resol, sizeof(float) * 2);
- 		
+ 		                              coord_array[0] + 1, resol, sizeof(float) * 2);
+ 
  		return 1;
  	}
  	return 0;
@@@ -3466,10 -3458,10 +3466,10 @@@
  #define LINK_ARROW  12  /* position of arrow on the link, LINK_RESOL/2 */
  #define ARROW_SIZE (7 * UI_DPI_FAC)
  void node_draw_link_bezier(View2D *v2d, SpaceNode *snode, bNodeLink *link,
 -                           int th_col1, bool do_shaded, int th_col2, bool do_triple, int th_col3)
 +						   int th_col1, bool do_shaded, int th_col2, bool do_triple, int th_col3)
  {
  	float coord_array[LINK_RESOL + 1][2];
- 	
+ 
  	if (node_link_bezier_points(v2d, snode, link, coord_array, LINK_RESOL)) {
  		float dist, spline_step = 0.0f;
  		int i;
@@@ -3478,14 -3470,14 +3478,14 @@@
  		float linew;
  		float arrow[2], arrow1[2], arrow2[2];
  		glGetFloatv(GL_LINE_WIDTH, &linew);
- 		
+ 
  		/* we can reuse the dist variable here to increment the GL curve eval amount*/
  		dist = 1.0f / (float)LINK_RESOL;
- 		
+ 
  		glEnable(GL_LINE_SMOOTH);
- 		
+ 
  		drawarrow = ((link->tonode && (link->tonode->type == NODE_REROUTE)) &&
 -		             (link->fromnode && (link->fromnode->type == NODE_REROUTE)));
 +					 (link->fromnode && (link->fromnode->type == NODE_REROUTE)));
  
  		if (drawarrow) {
  			/* draw arrow in line segment LINK_ARROW */