archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix for mixup in startup.blend data init when userprefs.blend was missing

Browse Source 
Rename UI_init_userdef_factory to BLO_update_defaults_userpref_blend
This closely matches BLO_update_defaults_startup_blend so makes sense for them to be together.
This commit is contained in:
Campbell Barton
2014-07-23 20:20:59 +10:00
parent 9fcaac5009
commit f88593df69
9 changed files with 67 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
source/blender/editors/interface/resources.c
View File

@@ -35,10 +35,7 @@
#include "MEM_guardedalloc.h"
#include "DNA_brush_types.h"
#include "DNA_curve_types.h"
#include "DNA_mesh_types.h" /* init_userdef_factory */
#include "DNA_object_types.h"
#include "DNA_screen_types.h"
#include "DNA_space_types.h"
#include "DNA_userdef_types.h"
@@ -48,13 +45,10 @@
#include "BLI_utildefines.h"
#include "BLI_math.h"
#include "BKE_brush.h"
#include "BKE_DerivedMesh.h"
#include "BKE_global.h"
#include "BKE_main.h"
#include "BKE_texture.h"
#include "BKE_library.h"
#include "BIF_gl.h"
@@ -2472,55 +2466,3 @@ void init_userdef_do_versions(void)
// XXX reset_autosave();
}
/**
* Override values in in-memory startup.blend, avoids resaving for small changes.
*/
void init_userdef_factory(void)
{
/* defaults from T37518 */
U.uiflag |= USER_ZBUF_CURSOR;
U.uiflag |= USER_QUIT_PROMPT;
U.uiflag |= USER_CONTINUOUS_MOUSE;
U.versions = 1;
U.savetime = 2;
{
Mesh *me;
for (me = G.main->mesh.first; me; me = me->id.next) {
me->flag &= ~ME_TWOSIDED;
}
}
{
Brush *br;
br = BKE_brush_add(G.main, "Fill");
br->imagepaint_tool = PAINT_TOOL_FILL;
br->ob_mode = OB_MODE_TEXTURE_PAINT;
br = (Brush *)BKE_libblock_find_name(ID_BR, "Mask");
if (br) {
br->imagepaint_tool = PAINT_TOOL_MASK;
br->ob_mode |= OB_MODE_TEXTURE_PAINT;
}
}
{
Scene *scene;
for (scene = G.main->scene.first; scene; scene = scene->id.next) {
if (scene->toolsettings) {
ToolSettings *ts = scene->toolsettings;
if (ts->sculpt) {
Sculpt *sculpt = ts->sculpt;
sculpt->paint.symmetry_flags |= PAINT_SYMM_X;
sculpt->flags |= SCULPT_DYNTOPO_COLLAPSE;
sculpt->detail_size = 12;
}
}
}
}
}