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).

5 files changed, 72 insertions, 55 deletions

diff --git a/source/blender/blenkernel/BKE_linestyle.h b/source/blender/blenkernel/BKE_linestyle.h
index 20e2039c488..3cbf3454f0b 100644
--- a/source/blender/blenkernel/BKE_linestyle.h
+++ b/source/blender/blenkernel/BKE_linestyle.h
@@ -1,8 +1,4 @@
-/* BKE_linestyle.h
- *
- *
- * $Id: BKE_particle.h 29187 2010-06-03 15:39:02Z kjym3 $
- *
+/*
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
@@ -29,8 +25,12 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef BKE_LINESTYLE_H
-#define BKE_LINESTYLE_H
+#ifndef __BKE_LINESTYLE_H__
+#define __BKE_LINESTYLE_H__
+/** \file BKE_linestyle.h
+ *  \ingroup bke
+ *  \brief Blender kernel freestyle line style functionality.
+ */
 
 #include "DNA_linestyle_types.h"
 
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 6208bb355b1..e3b16fd92e2 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -103,7 +103,8 @@ set(SRC
 	intern/lattice.c
 	intern/library.c
 	intern/linestyle.c
-	intern/mask_evaluate.c	intern/mask_rasterize.c
+	intern/mask_evaluate.c
+	intern/mask_rasterize.c
 	intern/mask.c
 	intern/material.c
 	intern/mball.c
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 9c94e267a7e..838cf3b8542 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -762,7 +762,7 @@ void BKE_animdata_main_cb(Main *mainptr, ID_AnimData_Edit_Callback func, void *u
 		AnimData *adt = BKE_animdata_from_id(id); \
 		if (adt) func(id, adt, user_data); \
 	} (void)0
-
+	
 	/* "embedded" nodetree cases (i.e. scene/material/texture->nodetree) */
 #define ANIMDATA_NODETREE_IDS_CB(first, NtId_Type) \
 	for (id = first; id; id = id->next) { \
@@ -774,13 +774,13 @@ void BKE_animdata_main_cb(Main *mainptr, ID_AnimData_Edit_Callback func, void *u
 		} \
 		if (adt) func(id, adt, user_data); \
 	} (void)0
-
+	
 	/* nodes */
 	ANIMDATA_IDS_CB(mainptr->nodetree.first);
-		
+	
 	/* textures */
 	ANIMDATA_NODETREE_IDS_CB(mainptr->tex.first, Tex);
-		
+	
 	/* lamps */
 	ANIMDATA_NODETREE_IDS_CB(mainptr->lamp.first, Lamp);
 	
@@ -921,8 +921,8 @@ void BKE_all_animdata_fix_paths_rename(ID *ref_id, const char *prefix, const cha
 	
 	/* scenes */
 	RENAMEFIX_ANIM_NODETREE_IDS(mainptr->scene.first, Scene);
-		}
-		
+}
+
 /* *********************************** */ 
 /* KeyingSet API */
 
diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c
index aa319ba67f2..aa9200adef4 100644
--- a/source/blender/blenkernel/intern/linestyle.c
+++ b/source/blender/blenkernel/intern/linestyle.c
@@ -1,7 +1,4 @@
-/* linestyle.c
- *
- * $Id$
- *
+/*
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
@@ -28,6 +25,10 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+/** \file blender/blenkernel/intern/linestyle.c
+ *  \ingroup bke
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -68,20 +69,21 @@ static const char *modifier_name[LS_MODIFIER_NUM] = {
 	"Guiding Lines",
 	"Blueprint",
 	"2D Offset",
-	"2D Transform"};
+	"2D Transform",
+};
 
 static void default_linestyle_settings(FreestyleLineStyle *linestyle)
 {
 	linestyle->panel = LS_PANEL_STROKES;
-	linestyle->r = linestyle->g = linestyle->b = 0.0;
-	linestyle->alpha = 1.0;
-	linestyle->thickness = 1.0;
+	linestyle->r = linestyle->g = linestyle->b = 0.0f;
+	linestyle->alpha = 1.0f;
+	linestyle->thickness = 1.0f;
 	linestyle->thickness_position = LS_THICKNESS_CENTER;
 	linestyle->thickness_ratio = 0.5f;
 	linestyle->chaining = LS_CHAINING_PLAIN;
 	linestyle->rounds = 3;
-	linestyle->min_angle = 0.0f;
-	linestyle->max_angle = 0.0f;
+	linestyle->min_angle = DEG2RADF(0.0f);
+	linestyle->max_angle = DEG2RADF(0.0f);
 	linestyle->min_length = 0.0f;
 	linestyle->max_length = 10000.0f;
 	linestyle->split_length = 100;
@@ -104,7 +106,7 @@ FreestyleLineStyle *FRS_new_linestyle(const char *name, struct Main *main)
 		main = G.main;
 
 	linestyle = (FreestyleLineStyle *)BKE_libblock_alloc(&main->linestyle, ID_LS, name);
-	
+
 	default_linestyle_settings(linestyle);
 
 	return linestyle;
@@ -130,7 +132,7 @@ FreestyleLineStyle *FRS_copy_linestyle(FreestyleLineStyle *linestyle)
 	FreestyleLineStyle *new_linestyle;
 	LineStyleModifier *m;
 
-	new_linestyle = FRS_new_linestyle(linestyle->id.name+2, NULL);
+	new_linestyle = FRS_new_linestyle(linestyle->id.name + 2, NULL);
 	FRS_free_linestyle(new_linestyle);
 
 	new_linestyle->r = linestyle->r;
@@ -164,6 +166,7 @@ FreestyleLineStyle *FRS_copy_linestyle(FreestyleLineStyle *linestyle)
 		FRS_copy_linestyle_thickness_modifier(new_linestyle, m);
 	for (m = (LineStyleModifier *)linestyle->geometry_modifiers.first; m; m = m->next)
 		FRS_copy_linestyle_geometry_modifier(new_linestyle, m);
+
 	return new_linestyle;
 }
 
@@ -178,6 +181,7 @@ static LineStyleModifier *new_modifier(int type, size_t size)
 		m->influence = 1.0f;
 		m->flags = LS_MODIFIER_ENABLED | LS_MODIFIER_EXPANDED;
 	}
+
 	return m;
 }
 
@@ -207,17 +211,19 @@ static LineStyleModifier *alloc_color_modifier(int type)
 	default:
 		return NULL; /* unknown modifier type */
 	}
+
 	return new_modifier(type, size);
 }
 
 LineStyleModifier *FRS_add_linestyle_color_modifier(FreestyleLineStyle *linestyle, int type)
 {
 	LineStyleModifier *m;
-	
+
 	m = alloc_color_modifier(type);
 	if (!m)
 		return NULL;
 	m->blend = MA_RAMP_BLEND;
+
 	switch (type) {
 	case LS_MODIFIER_ALONG_STROKE:
 		((LineStyleColorModifier_AlongStroke *)m)->color_ramp = add_colorband(1);
@@ -248,13 +254,14 @@ LineStyleModifier *FRS_add_linestyle_color_modifier(FreestyleLineStyle *linestyl
 LineStyleModifier *FRS_copy_linestyle_color_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m)
 {
 	LineStyleModifier *new_m;
-	
+
 	new_m = alloc_color_modifier(m->type);
 	if (!new_m)
 		return NULL;
 	new_m->influence = m->influence;
 	new_m->flags = m->flags;
 	new_m->blend = m->blend;
+
 	switch (m->type) {
 	case LS_MODIFIER_ALONG_STROKE:
 		{
@@ -341,11 +348,12 @@ static LineStyleModifier *alloc_alpha_modifier(int type)
 LineStyleModifier *FRS_add_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, int type)
 {
 	LineStyleModifier *m;
-	
+
 	m = alloc_alpha_modifier(type);
 	if (!m)
 		return NULL;
 	m->blend = LS_VALUE_BLEND;
+
 	switch (type) {
 	case LS_MODIFIER_ALONG_STROKE:
 		((LineStyleAlphaModifier_AlongStroke *)m)->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
@@ -376,13 +384,14 @@ LineStyleModifier *FRS_add_linestyle_alpha_modifier(FreestyleLineStyle *linestyl
 LineStyleModifier *FRS_copy_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m)
 {
 	LineStyleModifier *new_m;
-	
+
 	new_m = alloc_alpha_modifier(m->type);
 	if (!new_m)
 		return NULL;
 	new_m->influence = m->influence;
 	new_m->flags = m->flags;
 	new_m->blend = m->blend;
+
 	switch (m->type) {
 	case LS_MODIFIER_ALONG_STROKE:
 		{
@@ -466,6 +475,7 @@ static LineStyleModifier *alloc_thickness_modifier(int type)
 	default:
 		return NULL; /* unknown modifier type */
 	}
+
 	return new_modifier(type, size);
 }
 
@@ -477,6 +487,7 @@ LineStyleModifier *FRS_add_linestyle_thickness_modifier(FreestyleLineStyle *line
 	if (!m)
 		return NULL;
 	m->blend = LS_VALUE_BLEND;
+
 	switch (type) {
 	case LS_MODIFIER_ALONG_STROKE:
 		((LineStyleThicknessModifier_AlongStroke *)m)->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
@@ -527,6 +538,7 @@ LineStyleModifier *FRS_copy_linestyle_thickness_modifier(FreestyleLineStyle *lin
 	new_m->influence = m->influence;
 	new_m->flags = m->flags;
 	new_m->blend = m->blend;
+
 	switch (m->type) {
 	case LS_MODIFIER_ALONG_STROKE:
 		{
@@ -652,6 +664,7 @@ static LineStyleModifier *alloc_geometry_modifier(int type)
 	default:
 		return NULL; /* unknown modifier type */
 	}
+
 	return new_modifier(type, size);
 }
 
@@ -662,70 +675,71 @@ LineStyleModifier *FRS_add_linestyle_geometry_modifier(FreestyleLineStyle *lines
 	m = alloc_geometry_modifier(type);
 	if (!m)
 		return NULL;
+
 	switch (type) {
 	case LS_MODIFIER_SAMPLING:
-		((LineStyleGeometryModifier_Sampling *)m)->sampling = 10.0;
+		((LineStyleGeometryModifier_Sampling *)m)->sampling = 10.0f;
 		break;
 	case LS_MODIFIER_BEZIER_CURVE:
-		((LineStyleGeometryModifier_BezierCurve *)m)->error = 10.0;
+		((LineStyleGeometryModifier_BezierCurve *)m)->error = 10.0f;
 		break;
 	case LS_MODIFIER_SINUS_DISPLACEMENT:
-		((LineStyleGeometryModifier_SinusDisplacement *)m)->wavelength = 20.0;
-		((LineStyleGeometryModifier_SinusDisplacement *)m)->amplitude = 5.0;
-		((LineStyleGeometryModifier_SinusDisplacement *)m)->phase = 0.0;
+		((LineStyleGeometryModifier_SinusDisplacement *)m)->wavelength = 20.0f;
+		((LineStyleGeometryModifier_SinusDisplacement *)m)->amplitude = 5.0f;
+		((LineStyleGeometryModifier_SinusDisplacement *)m)->phase = 0.0f;
 		break;
 	case LS_MODIFIER_SPATIAL_NOISE:
-		((LineStyleGeometryModifier_SpatialNoise *)m)->amplitude = 5.0;
-		((LineStyleGeometryModifier_SpatialNoise *)m)->scale = 20.0;
+		((LineStyleGeometryModifier_SpatialNoise *)m)->amplitude = 5.0f;
+		((LineStyleGeometryModifier_SpatialNoise *)m)->scale = 20.0f;
 		((LineStyleGeometryModifier_SpatialNoise *)m)->octaves = 4;
 		((LineStyleGeometryModifier_SpatialNoise *)m)->flags = LS_MODIFIER_SPATIAL_NOISE_SMOOTH | LS_MODIFIER_SPATIAL_NOISE_PURERANDOM;
 		break;
 	case LS_MODIFIER_PERLIN_NOISE_1D:
-		((LineStyleGeometryModifier_PerlinNoise1D *)m)->frequency = 10.0;
-		((LineStyleGeometryModifier_PerlinNoise1D *)m)->amplitude = 10.0;
+		((LineStyleGeometryModifier_PerlinNoise1D *)m)->frequency = 10.0f;
+		((LineStyleGeometryModifier_PerlinNoise1D *)m)->amplitude = 10.0f;
 		((LineStyleGeometryModifier_PerlinNoise1D *)m)->octaves = 4;
 		((LineStyleGeometryModifier_PerlinNoise1D *)m)->angle = DEG2RADF(45.0f);
 		break;
 	case LS_MODIFIER_PERLIN_NOISE_2D:
-		((LineStyleGeometryModifier_PerlinNoise2D *)m)->frequency = 10.0;
-		((LineStyleGeometryModifier_PerlinNoise2D *)m)->amplitude = 10.0;
+		((LineStyleGeometryModifier_PerlinNoise2D *)m)->frequency = 10.0f;
+		((LineStyleGeometryModifier_PerlinNoise2D *)m)->amplitude = 10.0f;
 		((LineStyleGeometryModifier_PerlinNoise2D *)m)->octaves = 4;
 		((LineStyleGeometryModifier_PerlinNoise2D *)m)->angle = DEG2RADF(45.0f);
 		break;
 	case LS_MODIFIER_BACKBONE_STRETCHER:
-		((LineStyleGeometryModifier_BackboneStretcher *)m)->backbone_length = 10.0;
+		((LineStyleGeometryModifier_BackboneStretcher *)m)->backbone_length = 10.0f;
 		break;
 	case LS_MODIFIER_TIP_REMOVER:
-		((LineStyleGeometryModifier_TipRemover *)m)->tip_length = 10.0;
+		((LineStyleGeometryModifier_TipRemover *)m)->tip_length = 10.0f;
 		break;
 	case LS_MODIFIER_POLYGONIZATION:
-		((LineStyleGeometryModifier_Polygonalization *)m)->error = 10.0;
+		((LineStyleGeometryModifier_Polygonalization *)m)->error = 10.0f;
 		break;
 	case LS_MODIFIER_GUIDING_LINES:
-		((LineStyleGeometryModifier_GuidingLines *)m)->offset = 0.0;
+		((LineStyleGeometryModifier_GuidingLines *)m)->offset = 0.0f;
 		break;
 	case LS_MODIFIER_BLUEPRINT:
 		((LineStyleGeometryModifier_Blueprint *)m)->flags = LS_MODIFIER_BLUEPRINT_CIRCLES;
 		((LineStyleGeometryModifier_Blueprint *)m)->rounds = 1;
-		((LineStyleGeometryModifier_Blueprint *)m)->backbone_length = 10.f;
+		((LineStyleGeometryModifier_Blueprint *)m)->backbone_length = 10.0f;
 		((LineStyleGeometryModifier_Blueprint *)m)->random_radius = 3;
 		((LineStyleGeometryModifier_Blueprint *)m)->random_center = 5;
 		((LineStyleGeometryModifier_Blueprint *)m)->random_backbone = 5;
 		break;
 	case LS_MODIFIER_2D_OFFSET:
-		((LineStyleGeometryModifier_2DOffset *)m)->start = 0.f;
-		((LineStyleGeometryModifier_2DOffset *)m)->end = 0.f;
-		((LineStyleGeometryModifier_2DOffset *)m)->x = 0.f;
-		((LineStyleGeometryModifier_2DOffset *)m)->y = 0.f;
+		((LineStyleGeometryModifier_2DOffset *)m)->start = 0.0f;
+		((LineStyleGeometryModifier_2DOffset *)m)->end = 0.0f;
+		((LineStyleGeometryModifier_2DOffset *)m)->x = 0.0f;
+		((LineStyleGeometryModifier_2DOffset *)m)->y = 0.0f;
 		break;
 	case LS_MODIFIER_2D_TRANSFORM:
 		((LineStyleGeometryModifier_2DTransform *)m)->pivot = LS_MODIFIER_2D_TRANSFORM_PIVOT_CENTER;
-		((LineStyleGeometryModifier_2DTransform *)m)->scale_x = 1.f;
-		((LineStyleGeometryModifier_2DTransform *)m)->scale_y = 1.f;
+		((LineStyleGeometryModifier_2DTransform *)m)->scale_x = 1.0f;
+		((LineStyleGeometryModifier_2DTransform *)m)->scale_y = 1.0f;
 		((LineStyleGeometryModifier_2DTransform *)m)->angle = DEG2RADF(0.0f);
 		((LineStyleGeometryModifier_2DTransform *)m)->pivot_u = 0.5f;
-		((LineStyleGeometryModifier_2DTransform *)m)->pivot_x = 0.f;
-		((LineStyleGeometryModifier_2DTransform *)m)->pivot_y = 0.f;
+		((LineStyleGeometryModifier_2DTransform *)m)->pivot_x = 0.0f;
+		((LineStyleGeometryModifier_2DTransform *)m)->pivot_y = 0.0f;
 		break;
 	default:
 		return NULL; /* unknown modifier type */
@@ -743,6 +757,7 @@ LineStyleModifier *FRS_copy_linestyle_geometry_modifier(FreestyleLineStyle *line
 	if (!new_m)
 		return NULL;
 	new_m->flags = m->flags;
+
 	switch (m->type) {
 	case LS_MODIFIER_SAMPLING:
 		{
@@ -947,6 +962,7 @@ void FRS_list_modifier_color_ramps(FreestyleLineStyle *linestyle, ListBase *list
 	}
 }
 
+/* XXX Do we want to keep that goto? Or use a boolean var? */
 char *FRS_path_from_ID_to_color_ramp(FreestyleLineStyle *linestyle, ColorBand *color_ramp)
 {
 	LineStyleModifier *m;
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index d0af06d9f90..8fcd5ca56d0 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -288,7 +288,7 @@ void BKE_scene_free(Scene *sce)
 {
 	Base *base;
 	SceneRenderLayer *srl;
-	
+
 	base = sce->base.first;
 	while (base) {
 		base->object->id.us--;