Merged changes in the trunk up to revision 41768.

Conflicts resolved:
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_enum_types.h
source/blender/render/intern/source/shadeinput.c
source/blenderplayer/bad_level_call_stubs/stubs.c

Additional changes:

* source/blender/makesrna/intern/rna_linestyle.c: Fixed white
space issues that generated a number of compiler errors.  The
problem was that two string literals for enumerating MA_RAMP_SOFT
and MA_RAMP_LINEAR contained a space.  The string literals are
supposed to represent a valid C identifier because of their use
for automatic code generation.

* Stroke transparency has been temporarily disabled due to a
functionality conflict with some merged changes.  A fix of this
issue is planned.

1 files changed, 16 insertions, 16 deletions

diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c
index d91282e768f..41aae64445a 100644
--- a/source/blender/editors/space_file/file_draw.c
+++ b/source/blender/editors/space_file/file_draw.c
@@ -177,17 +177,17 @@ void file_draw_buttons(const bContext *C, ARegion *ar)
 		uiBlockSetFunc(block, file_draw_check_cb, NULL, NULL);
 
 		but = uiDefButTextO(block, TEX, "FILE_OT_directory", 0, "",
-				 min_x, line1_y, line1_w-chan_offs, btn_h, 
-				 params->dir, 0.0, (float)FILE_MAX, 0, 0,
-				 TIP_("File path"));
+		                    min_x, line1_y, line1_w-chan_offs, btn_h,
+		                    params->dir, 0.0, (float)FILE_MAX, 0, 0,
+		                    TIP_("File path"));
 		uiButSetCompleteFunc(but, autocomplete_directory, NULL);
 		uiButSetFlag(but, UI_BUT_NO_UTF8);
 
 		if((params->flag & FILE_DIRSEL_ONLY) == 0) {
 			but = uiDefBut(block, TEX, B_FS_FILENAME, "",
-					 min_x, line2_y, line2_w-chan_offs, btn_h,
-					 params->file, 0.0, (float)FILE_MAXFILE, 0, 0,
-					 TIP_(overwrite_alert ?N_("File name, overwrite existing") : N_("File name")));
+			               min_x, line2_y, line2_w-chan_offs, btn_h,
+			               params->file, 0.0, (float)FILE_MAXFILE, 0, 0,
+			               TIP_(overwrite_alert ?N_("File name, overwrite existing") : N_("File name")));
 			uiButSetCompleteFunc(but, autocomplete_file, NULL);
 			uiButSetFlag(but, UI_BUT_NO_UTF8);
 
@@ -205,16 +205,16 @@ void file_draw_buttons(const bContext *C, ARegion *ar)
 	if (fnumbuttons && (params->flag & FILE_DIRSEL_ONLY) == 0) {
 		uiBlockBeginAlign(block);
 		but = uiDefIconButO(block, BUT, "FILE_OT_filenum", 0, ICON_ZOOMOUT,
-				min_x + line2_w + separator - chan_offs, line2_y,
-				btn_fn_w, btn_h,
-				TIP_("Decrement the filename number"));
-		RNA_int_set(uiButGetOperatorPtrRNA(but), "increment", -1); 
-	
+		                    min_x + line2_w + separator - chan_offs, line2_y,
+		                    btn_fn_w, btn_h,
+		                    TIP_("Decrement the filename number"));
+		RNA_int_set(uiButGetOperatorPtrRNA(but), "increment", -1);
+
 		but = uiDefIconButO(block, BUT, "FILE_OT_filenum", 0, ICON_ZOOMIN,
-				min_x + line2_w + separator + btn_fn_w - chan_offs, line2_y,
-				btn_fn_w, btn_h,
-				TIP_("Increment the filename number"));
-		RNA_int_set(uiButGetOperatorPtrRNA(but), "increment", 1); 
+		                    min_x + line2_w + separator + btn_fn_w - chan_offs, line2_y,
+		                    btn_fn_w, btn_h,
+		                    TIP_("Increment the filename number"));
+		RNA_int_set(uiButGetOperatorPtrRNA(but), "increment", 1);
 		uiBlockEndAlign(block);
 	}
 	
@@ -235,7 +235,7 @@ void file_draw_buttons(const bContext *C, ARegion *ar)
 
 
 static void draw_tile(int sx, int sy, int width, int height, int colorid, int shade)
-{	
+{
 	UI_ThemeColorShade(colorid, shade);
 	uiSetRoundBox(UI_CNR_ALL);
 	uiRoundBox((float)sx, (float)(sy - height), (float)(sx + width), (float)sy, 5.0f);