Fix wrong temporary path in user preferences, revert startup.blend and instead

do the freestyle changes in BLO_update_defaults_startup_blend.

1 files changed, 12 insertions, 1 deletions

diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index 7acb205377b..6a0f1747d2f 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -27,6 +27,8 @@
 
 #include "BLI_utildefines.h"
 
+#include "DNA_freestyle_types.h"
+#include "DNA_linestyle_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_userdef_types.h"
 
@@ -39,8 +41,17 @@
 void BLO_update_defaults_startup_blend(Main *main)
 {
 	Scene *scene;
+	SceneRenderLayer *srl;
+	FreestyleLineStyle *linestyle;
 
-	for (scene = main->scene.first; scene; scene = scene->id.next)
+	for (scene = main->scene.first; scene; scene = scene->id.next) {
 		scene->r.im_format.planes = R_IMF_PLANES_RGBA;
+
+		for (srl = scene->r.layers.first; srl; srl = srl->next)
+			srl->freestyleConfig.sphere_radius = 0.1f;
+	}
+
+	for (linestyle = main->linestyle.first; linestyle; linestyle = linestyle->id.next)
+		linestyle->flag = LS_SAME_OBJECT;
 }