1 files changed, 161 insertions, 147 deletions

diff --git a/source/blender/blenkernel/intern/freestyle.c b/source/blender/blenkernel/intern/freestyle.c
index 10fd2db187d..72b81651124 100644
--- a/source/blender/blenkernel/intern/freestyle.c
+++ b/source/blender/blenkernel/intern/freestyle.c
@@ -42,212 +42,226 @@ static void copy_module(FreestyleModuleConfig *new_module, FreestyleModuleConfig
 
 void BKE_freestyle_config_init(FreestyleConfig *config)
 {
-	config->mode = FREESTYLE_CONTROL_EDITOR_MODE;
+  config->mode = FREESTYLE_CONTROL_EDITOR_MODE;
 
-	BLI_listbase_clear(&config->modules);
-	config->flags = 0;
-	config->sphere_radius = 0.1f;
-	config->dkr_epsilon = 0.0f;
-	config->crease_angle = DEG2RADF(134.43f);
+  BLI_listbase_clear(&config->modules);
+  config->flags = 0;
+  config->sphere_radius = 0.1f;
+  config->dkr_epsilon = 0.0f;
+  config->crease_angle = DEG2RADF(134.43f);
 
-	BLI_listbase_clear(&config->linesets);
+  BLI_listbase_clear(&config->linesets);
 }
 
 void BKE_freestyle_config_free(FreestyleConfig *config, const bool do_id_user)
 {
-	FreestyleLineSet *lineset;
-
-	for (lineset = (FreestyleLineSet *)config->linesets.first; lineset; lineset = lineset->next) {
-		if (lineset->group) {
-			if (do_id_user) {
-				id_us_min(&lineset->group->id);
-			}
-			lineset->group = NULL;
-		}
-		if (lineset->linestyle) {
-			if (do_id_user) {
-				id_us_min(&lineset->linestyle->id);
-			}
-			lineset->linestyle = NULL;
-		}
-	}
-	BLI_freelistN(&config->linesets);
-	BLI_freelistN(&config->modules);
-}
-
-void BKE_freestyle_config_copy(FreestyleConfig *new_config, const FreestyleConfig *config, const int flag)
-{
-	FreestyleLineSet *lineset, *new_lineset;
-	FreestyleModuleConfig *module, *new_module;
-
-	new_config->mode = config->mode;
-	new_config->flags = config->flags;
-	new_config->sphere_radius = config->sphere_radius;
-	new_config->dkr_epsilon = config->dkr_epsilon;
-	new_config->crease_angle = config->crease_angle;
-
-	BLI_listbase_clear(&new_config->linesets);
-	for (lineset = (FreestyleLineSet *)config->linesets.first; lineset; lineset = lineset->next) {
-		new_lineset = alloc_lineset();
-		copy_lineset(new_lineset, lineset, flag);
-		BLI_addtail(&new_config->linesets, (void *)new_lineset);
-	}
-
-	BLI_listbase_clear(&new_config->modules);
-	for (module = (FreestyleModuleConfig *)config->modules.first; module; module = module->next) {
-		new_module = alloc_module();
-		copy_module(new_module, module);
-		BLI_addtail(&new_config->modules, (void *)new_module);
-	}
+  FreestyleLineSet *lineset;
+
+  for (lineset = (FreestyleLineSet *)config->linesets.first; lineset; lineset = lineset->next) {
+    if (lineset->group) {
+      if (do_id_user) {
+        id_us_min(&lineset->group->id);
+      }
+      lineset->group = NULL;
+    }
+    if (lineset->linestyle) {
+      if (do_id_user) {
+        id_us_min(&lineset->linestyle->id);
+      }
+      lineset->linestyle = NULL;
+    }
+  }
+  BLI_freelistN(&config->linesets);
+  BLI_freelistN(&config->modules);
 }
 
-static void copy_lineset(FreestyleLineSet *new_lineset, FreestyleLineSet *lineset, const int flag)
+void BKE_freestyle_config_copy(FreestyleConfig *new_config,
+                               const FreestyleConfig *config,
+                               const int flag)
 {
-	new_lineset->linestyle = lineset->linestyle;
-	new_lineset->flags = lineset->flags;
-	new_lineset->selection = lineset->selection;
-	new_lineset->qi = lineset->qi;
-	new_lineset->qi_start = lineset->qi_start;
-	new_lineset->qi_end = lineset->qi_end;
-	new_lineset->edge_types = lineset->edge_types;
-	new_lineset->exclude_edge_types = lineset->exclude_edge_types;
-	new_lineset->group = lineset->group;
-	strcpy(new_lineset->name, lineset->name);
+  FreestyleLineSet *lineset, *new_lineset;
+  FreestyleModuleConfig *module, *new_module;
+
+  new_config->mode = config->mode;
+  new_config->flags = config->flags;
+  new_config->sphere_radius = config->sphere_radius;
+  new_config->dkr_epsilon = config->dkr_epsilon;
+  new_config->crease_angle = config->crease_angle;
+
+  BLI_listbase_clear(&new_config->linesets);
+  for (lineset = (FreestyleLineSet *)config->linesets.first; lineset; lineset = lineset->next) {
+    new_lineset = alloc_lineset();
+    copy_lineset(new_lineset, lineset, flag);
+    BLI_addtail(&new_config->linesets, (void *)new_lineset);
+  }
+
+  BLI_listbase_clear(&new_config->modules);
+  for (module = (FreestyleModuleConfig *)config->modules.first; module; module = module->next) {
+    new_module = alloc_module();
+    copy_module(new_module, module);
+    BLI_addtail(&new_config->modules, (void *)new_module);
+  }
+}
 
-	if ((flag & LIB_ID_CREATE_NO_USER_REFCOUNT) == 0) {
-		id_us_plus((ID *)new_lineset->linestyle);
-		id_us_plus((ID *)new_lineset->group);
-	}
+static void copy_lineset(FreestyleLineSet *new_lineset, FreestyleLineSet *lineset, const int flag)
+{
+  new_lineset->linestyle = lineset->linestyle;
+  new_lineset->flags = lineset->flags;
+  new_lineset->selection = lineset->selection;
+  new_lineset->qi = lineset->qi;
+  new_lineset->qi_start = lineset->qi_start;
+  new_lineset->qi_end = lineset->qi_end;
+  new_lineset->edge_types = lineset->edge_types;
+  new_lineset->exclude_edge_types = lineset->exclude_edge_types;
+  new_lineset->group = lineset->group;
+  strcpy(new_lineset->name, lineset->name);
+
+  if ((flag & LIB_ID_CREATE_NO_USER_REFCOUNT) == 0) {
+    id_us_plus((ID *)new_lineset->linestyle);
+    id_us_plus((ID *)new_lineset->group);
+  }
 }
 
 static FreestyleModuleConfig *alloc_module(void)
 {
-	return (FreestyleModuleConfig *)MEM_callocN(sizeof(FreestyleModuleConfig), "style module configuration");
+  return (FreestyleModuleConfig *)MEM_callocN(sizeof(FreestyleModuleConfig),
+                                              "style module configuration");
 }
 
 FreestyleModuleConfig *BKE_freestyle_module_add(FreestyleConfig *config)
 {
-	FreestyleModuleConfig *module_conf = alloc_module();
-	BLI_addtail(&config->modules, (void *)module_conf);
-	module_conf->script = NULL;
-	module_conf->is_displayed = 1;
-	return module_conf;
+  FreestyleModuleConfig *module_conf = alloc_module();
+  BLI_addtail(&config->modules, (void *)module_conf);
+  module_conf->script = NULL;
+  module_conf->is_displayed = 1;
+  return module_conf;
 }
 
 static void copy_module(FreestyleModuleConfig *new_module, FreestyleModuleConfig *module)
 {
-	new_module->script = module->script;
-	new_module->is_displayed = module->is_displayed;
+  new_module->script = module->script;
+  new_module->is_displayed = module->is_displayed;
 }
 
 bool BKE_freestyle_module_delete(FreestyleConfig *config, FreestyleModuleConfig *module_conf)
 {
-	if (BLI_findindex(&config->modules, module_conf) == -1)
-		return false;
-	BLI_freelinkN(&config->modules, module_conf);
-	return true;
+  if (BLI_findindex(&config->modules, module_conf) == -1)
+    return false;
+  BLI_freelinkN(&config->modules, module_conf);
+  return true;
 }
 
 /**
  * Reinsert \a module_conf offset by \a direction from current position.
  * \return if position of \a module_conf changed.
  */
-bool BKE_freestyle_module_move(FreestyleConfig *config, FreestyleModuleConfig *module_conf, int direction)
+bool BKE_freestyle_module_move(FreestyleConfig *config,
+                               FreestyleModuleConfig *module_conf,
+                               int direction)
 {
-	return ((BLI_findindex(&config->modules, module_conf) > -1) &&
-	        (BLI_listbase_link_move(&config->modules, module_conf, direction) == true));
+  return ((BLI_findindex(&config->modules, module_conf) > -1) &&
+          (BLI_listbase_link_move(&config->modules, module_conf, direction) == true));
 }
 
 void BKE_freestyle_lineset_unique_name(FreestyleConfig *config, FreestyleLineSet *lineset)
 {
-	BLI_uniquename(&config->linesets, lineset, "FreestyleLineSet", '.', offsetof(FreestyleLineSet, name),
-	               sizeof(lineset->name));
+  BLI_uniquename(&config->linesets,
+                 lineset,
+                 "FreestyleLineSet",
+                 '.',
+                 offsetof(FreestyleLineSet, name),
+                 sizeof(lineset->name));
 }
 
 static FreestyleLineSet *alloc_lineset(void)
 {
-	return (FreestyleLineSet *)MEM_callocN(sizeof(FreestyleLineSet), "Freestyle line set");
+  return (FreestyleLineSet *)MEM_callocN(sizeof(FreestyleLineSet), "Freestyle line set");
 }
 
-FreestyleLineSet *BKE_freestyle_lineset_add(struct Main *bmain, FreestyleConfig *config, const char *name)
+FreestyleLineSet *BKE_freestyle_lineset_add(struct Main *bmain,
+                                            FreestyleConfig *config,
+                                            const char *name)
 {
-	int lineset_index = BLI_listbase_count(&config->linesets);
-
-	FreestyleLineSet *lineset = alloc_lineset();
-	BLI_addtail(&config->linesets, (void *)lineset);
-	BKE_freestyle_lineset_set_active_index(config, lineset_index);
-
-	lineset->linestyle = BKE_linestyle_new(bmain, "LineStyle");
-	lineset->flags |= FREESTYLE_LINESET_ENABLED;
-	lineset->selection = FREESTYLE_SEL_VISIBILITY | FREESTYLE_SEL_EDGE_TYPES | FREESTYLE_SEL_IMAGE_BORDER;
-	lineset->qi = FREESTYLE_QI_VISIBLE;
-	lineset->qi_start = 0;
-	lineset->qi_end = 100;
-	lineset->edge_types = FREESTYLE_FE_SILHOUETTE | FREESTYLE_FE_BORDER | FREESTYLE_FE_CREASE;
-	lineset->exclude_edge_types = 0;
-	lineset->group = NULL;
-	if (name) {
-		BLI_strncpy(lineset->name, name, sizeof(lineset->name));
-	}
-	else if (lineset_index > 0) {
-		sprintf(lineset->name, "LineSet %i", lineset_index + 1);
-	}
-	else {
-		strcpy(lineset->name, "LineSet");
-	}
-	BKE_freestyle_lineset_unique_name(config, lineset);
-
-	return lineset;
+  int lineset_index = BLI_listbase_count(&config->linesets);
+
+  FreestyleLineSet *lineset = alloc_lineset();
+  BLI_addtail(&config->linesets, (void *)lineset);
+  BKE_freestyle_lineset_set_active_index(config, lineset_index);
+
+  lineset->linestyle = BKE_linestyle_new(bmain, "LineStyle");
+  lineset->flags |= FREESTYLE_LINESET_ENABLED;
+  lineset->selection = FREESTYLE_SEL_VISIBILITY | FREESTYLE_SEL_EDGE_TYPES |
+                       FREESTYLE_SEL_IMAGE_BORDER;
+  lineset->qi = FREESTYLE_QI_VISIBLE;
+  lineset->qi_start = 0;
+  lineset->qi_end = 100;
+  lineset->edge_types = FREESTYLE_FE_SILHOUETTE | FREESTYLE_FE_BORDER | FREESTYLE_FE_CREASE;
+  lineset->exclude_edge_types = 0;
+  lineset->group = NULL;
+  if (name) {
+    BLI_strncpy(lineset->name, name, sizeof(lineset->name));
+  }
+  else if (lineset_index > 0) {
+    sprintf(lineset->name, "LineSet %i", lineset_index + 1);
+  }
+  else {
+    strcpy(lineset->name, "LineSet");
+  }
+  BKE_freestyle_lineset_unique_name(config, lineset);
+
+  return lineset;
 }
 
 bool BKE_freestyle_lineset_delete(FreestyleConfig *config, FreestyleLineSet *lineset)
 {
-	if (BLI_findindex(&config->linesets, lineset) == -1)
-		return false;
-	if (lineset->group) {
-		id_us_min(&lineset->group->id);
-	}
-	if (lineset->linestyle) {
-		id_us_min(&lineset->linestyle->id);
-	}
-	BLI_remlink(&config->linesets, lineset);
-	MEM_freeN(lineset);
-	BKE_freestyle_lineset_set_active_index(config, 0);
-	return true;
+  if (BLI_findindex(&config->linesets, lineset) == -1)
+    return false;
+  if (lineset->group) {
+    id_us_min(&lineset->group->id);
+  }
+  if (lineset->linestyle) {
+    id_us_min(&lineset->linestyle->id);
+  }
+  BLI_remlink(&config->linesets, lineset);
+  MEM_freeN(lineset);
+  BKE_freestyle_lineset_set_active_index(config, 0);
+  return true;
 }
 
 FreestyleLineSet *BKE_freestyle_lineset_get_active(FreestyleConfig *config)
 {
-	FreestyleLineSet *lineset;
+  FreestyleLineSet *lineset;
 
-	for (lineset = (FreestyleLineSet *)config->linesets.first; lineset; lineset = lineset->next) {
-		if (lineset->flags & FREESTYLE_LINESET_CURRENT)
-			return lineset;
-	}
-	return NULL;
+  for (lineset = (FreestyleLineSet *)config->linesets.first; lineset; lineset = lineset->next) {
+    if (lineset->flags & FREESTYLE_LINESET_CURRENT)
+      return lineset;
+  }
+  return NULL;
 }
 
 short BKE_freestyle_lineset_get_active_index(FreestyleConfig *config)
 {
-	FreestyleLineSet *lineset;
-	short i;
-
-	for (lineset = (FreestyleLineSet *)config->linesets.first, i = 0; lineset; lineset = lineset->next, i++) {
-		if (lineset->flags & FREESTYLE_LINESET_CURRENT)
-			return i;
-	}
-	return 0;
+  FreestyleLineSet *lineset;
+  short i;
+
+  for (lineset = (FreestyleLineSet *)config->linesets.first, i = 0; lineset;
+       lineset = lineset->next, i++) {
+    if (lineset->flags & FREESTYLE_LINESET_CURRENT)
+      return i;
+  }
+  return 0;
 }
 
 void BKE_freestyle_lineset_set_active_index(FreestyleConfig *config, short index)
 {
-	FreestyleLineSet *lineset;
-	short i;
-
-	for (lineset = (FreestyleLineSet *)config->linesets.first, i = 0; lineset; lineset = lineset->next, i++) {
-		if (i == index)
-			lineset->flags |= FREESTYLE_LINESET_CURRENT;
-		else
-			lineset->flags &= ~FREESTYLE_LINESET_CURRENT;
-	}
+  FreestyleLineSet *lineset;
+  short i;
+
+  for (lineset = (FreestyleLineSet *)config->linesets.first, i = 0; lineset;
+       lineset = lineset->next, i++) {
+    if (i == index)
+      lineset->flags |= FREESTYLE_LINESET_CURRENT;
+    else
+      lineset->flags &= ~FREESTYLE_LINESET_CURRENT;
+  }
 }