A big cleaning patch by Bastien Montagne (thanks a lot!)

* Split and moved Cycles’ render layers panels into the render_layer
context as well (would be nice to hide this context when not needed,
e.g. with the BGE, but this is not so easy to do nicely...).

* Fixed some inconsistencies with trunk (probably due to svn merge
glitches) using r52858 as reference.  Also recovered the missing
release/bin/blender-softwaregl file.

* A bunch of style code fixes in Blender's own code (not Freestyle
itself yet): line lengths, spaces around operators, block formatting,
headers, etc.  In rna_linestyle.c, color_blend_items was replaced by
ramp_blend_items (exported from rna_material.c).

1 files changed, 3 insertions, 3 deletions

diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c
index fdb6c0afa4e..361f4a01661 100644
--- a/source/blender/makesrna/intern/rna_color.c
+++ b/source/blender/makesrna/intern/rna_color.c
@@ -195,8 +195,8 @@ static char *rna_ColorRamp_path(PointerRNA *ptr)
 				char *path = FRS_path_from_ID_to_color_ramp((FreestyleLineStyle *)id, (ColorBand *)ptr->data);
 				if (path)
 					return path;
-			}
 				break;
+			}
 		}
 	}
 	else {
@@ -279,8 +279,8 @@ static char *rna_ColorRampElement_path(PointerRNA *ptr)
 					COLRAMP_GETPATH;
 				}
 				BLI_freelistN(&listbase);
-			}
 				break;
+			}
 
 			default: /* everything else should have a "color_ramp" property */
 			{
@@ -338,8 +338,8 @@ static void rna_ColorRamp_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *
 				FreestyleLineStyle *linestyle= ptr->id.data;
 
 				WM_main_add_notifier(NC_LINESTYLE, linestyle);
-			}
 				break;
+			}
 			default:
 				break;
 		}