Fix wrong temporary path in user preferences, revert startup.blend and instead
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 16 Sep 2013 21:05:39 +0000 (21:05 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 16 Sep 2013 21:05:39 +0000 (21:05 +0000)
do the freestyle changes in BLO_update_defaults_startup_blend.

release/datafiles/startup.blend
source/blender/blenloader/intern/versioning_defaults.c

index e12da77cd042b214bcc036bfd2377aeceb769f75..8b58493fe3a4a1b8e404ee214d1610104aabbab8 100644 (file)
Binary files a/release/datafiles/startup.blend and b/release/datafiles/startup.blend differ
index 7acb205377bb1ab026fcbad474b0db7223d1786c..6a0f1747d2f66bb2c2077f7d59b703ad4d61dc6e 100644 (file)
@@ -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"
 
 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;
 }