[Bf-blender-cvs] [dbcc96334a1] blender2.8: Fix wrong default properties editor tabs in default workspaces.
Brecht Van Lommel
noreply at git.blender.org
Tue Aug 21 14:00:47 CEST 2018
Commit: dbcc96334a1c0afa31340822787050d5b841e2c6
Author: Brecht Van Lommel
Date: Tue Aug 21 12:55:39 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBdbcc96334a1c0afa31340822787050d5b841e2c6
Fix wrong default properties editor tabs in default workspaces.
Remove most of the defaults versioning code now that there is a
startup.blend with those changes included.
===================================================================
M source/blender/blenloader/intern/versioning_defaults.c
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index 5bddb81bfae..cc937edf6ab 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -57,30 +57,6 @@
*/
void BLO_update_defaults_userpref_blend(void)
{
- /* Defaults from T37518. */
- U.uiflag |= USER_DEPTH_CURSOR;
- U.uiflag |= USER_QUIT_PROMPT;
- U.uiflag |= USER_CONTINUOUS_MOUSE;
-
- /* See T45301 */
- U.uiflag |= USER_LOCK_CURSOR_ADJUST;
-
- /* Default from T47064. */
- U.audiorate = 48000;
-
- /* Defaults from T54943 (phase 1). */
- U.flag &= ~USER_TOOLTIPS_PYTHON;
- U.uiflag |= USER_AUTOPERSP;
- U.uiflag2 |= USER_REGION_OVERLAP;
-
- U.versions = 1;
- U.savetime = 2;
-
- /* Keep this a very small, non-zero number so zero-alpha doesn't mask out objects behind it.
- * but take care since some hardware has driver bugs here (T46962).
- * Further hardware workarounds should be made in gpu_extensions.c */
- U.glalphaclip = (1.0f / 255);
-
/* default so DPI is detected automatically */
U.dpi = 0;
U.ui_scale = 1.0f;
@@ -106,157 +82,8 @@ void BLO_update_defaults_userpref_blend(void)
* This function can be emptied each time the startup.blend is updated. */
void BLO_update_defaults_startup_blend(Main *bmain)
{
- for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
- BLI_strncpy(scene->r.engine, RE_engine_id_BLENDER_EEVEE, sizeof(scene->r.engine));
-
- scene->r.im_format.planes = R_IMF_PLANES_RGBA;
- scene->r.im_format.compress = 15;
-
- for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) {
- view_layer->freestyle_config.sphere_radius = 0.1f;
- view_layer->pass_alpha_threshold = 0.5f;
- }
-
- if (scene->toolsettings) {
- ToolSettings *ts = scene->toolsettings;
-
- ts->object_flag |= SCE_OBJECT_MODE_LOCK;
-
- ts->uvcalc_flag |= UVCALC_TRANSFORM_CORRECT;
-
- if (ts->sculpt) {
- Sculpt *sculpt = ts->sculpt;
- sculpt->paint.symmetry_flags |= PAINT_SYMM_X;
- sculpt->flags |= SCULPT_DYNTOPO_COLLAPSE;
- sculpt->detail_size = 12;
- }
-
- if (ts->vpaint) {
- VPaint *vp = ts->vpaint;
- vp->radial_symm[0] = vp->radial_symm[1] = vp->radial_symm[2] = 1;
- }
-
- if (ts->wpaint) {
- VPaint *wp = ts->wpaint;
- wp->radial_symm[0] = wp->radial_symm[1] = wp->radial_symm[2] = 1;
- }
-
- if (ts->gp_sculpt.brush[0].size == 0) {
- GP_BrushEdit_Settings *gset = &ts->gp_sculpt;
- GP_EditBrush_Data *brush;
- float curcolor_add[3], curcolor_sub[3];
- ARRAY_SET_ITEMS(curcolor_add, 1.0f, 0.6f, 0.6f);
- ARRAY_SET_ITEMS(curcolor_sub, 0.6f, 0.6f, 1.0f);
-
- /* default sculpt brush */
- gset->brushtype = GP_EDITBRUSH_TYPE_PUSH;
- /* default weight paint brush */
- gset->weighttype = GP_EDITBRUSH_TYPE_WEIGHT;
-
- brush = &gset->brush[GP_EDITBRUSH_TYPE_SMOOTH];
- brush->size = 25;
- brush->strength = 0.3f;
- brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF | GP_EDITBRUSH_FLAG_SMOOTH_PRESSURE | GP_EDITBRUSH_FLAG_ENABLE_CURSOR;
- copy_v3_v3(brush->curcolor_add, curcolor_add);
- copy_v3_v3(brush->curcolor_sub, curcolor_sub);
-
- brush = &gset->brush[GP_EDITBRUSH_TYPE_THICKNESS];
- brush->size = 25;
- brush->strength = 0.5f;
- brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF | GP_EDITBRUSH_FLAG_ENABLE_CURSOR;
- copy_v3_v3(brush->curcolor_add, curcolor_add);
- copy_v3_v3(brush->curcolor_sub, curcolor_sub);
-
- brush = &gset->brush[GP_EDITBRUSH_TYPE_STRENGTH];
- brush->size = 25;
- brush->strength = 0.5f;
- brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF | GP_EDITBRUSH_FLAG_ENABLE_CURSOR;
- copy_v3_v3(brush->curcolor_add, curcolor_add);
- copy_v3_v3(brush->curcolor_sub, curcolor_sub);
-
- brush = &gset->brush[GP_EDITBRUSH_TYPE_GRAB];
- brush->size = 50;
- brush->strength = 0.3f;
- brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF | GP_EDITBRUSH_FLAG_ENABLE_CURSOR;
- copy_v3_v3(brush->curcolor_add, curcolor_add);
- copy_v3_v3(brush->curcolor_sub, curcolor_sub);
-
- brush = &gset->brush[GP_EDITBRUSH_TYPE_PUSH];
- brush->size = 25;
- brush->strength = 0.3f;
- brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF | GP_EDITBRUSH_FLAG_ENABLE_CURSOR;
- copy_v3_v3(brush->curcolor_add, curcolor_add);
- copy_v3_v3(brush->curcolor_sub, curcolor_sub);
-
- brush = &gset->brush[GP_EDITBRUSH_TYPE_TWIST];
- brush->size = 50;
- brush->strength = 0.3f; // XXX?
- brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF | GP_EDITBRUSH_FLAG_ENABLE_CURSOR;
- copy_v3_v3(brush->curcolor_add, curcolor_add);
- copy_v3_v3(brush->curcolor_sub, curcolor_sub);
-
- brush = &gset->brush[GP_EDITBRUSH_TYPE_PINCH];
- brush->size = 50;
- brush->strength = 0.5f; // XXX?
- brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF | GP_EDITBRUSH_FLAG_ENABLE_CURSOR;
- copy_v3_v3(brush->curcolor_add, curcolor_add);
- copy_v3_v3(brush->curcolor_sub, curcolor_sub);
-
- brush = &gset->brush[GP_EDITBRUSH_TYPE_RANDOMIZE];
- brush->size = 25;
- brush->strength = 0.5f;
- brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF | GP_EDITBRUSH_FLAG_ENABLE_CURSOR;
- copy_v3_v3(brush->curcolor_add, curcolor_add);
- copy_v3_v3(brush->curcolor_sub, curcolor_sub);
-
- brush = &gset->brush[GP_EDITBRUSH_TYPE_WEIGHT];
- brush->size = 25;
- brush->strength = 0.5f;
- brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF | GP_EDITBRUSH_FLAG_ENABLE_CURSOR;
- copy_v3_v3(brush->curcolor_add, curcolor_add);
- copy_v3_v3(brush->curcolor_sub, curcolor_sub);
- }
-
- ts->gpencil_v3d_align = GP_PROJECT_VIEWSPACE;
- ts->gpencil_v2d_align = GP_PROJECT_VIEWSPACE;
- ts->gpencil_seq_align = GP_PROJECT_VIEWSPACE;
- ts->gpencil_ima_align = GP_PROJECT_VIEWSPACE;
-
- ts->annotate_v3d_align = GP_PROJECT_VIEWSPACE | GP_PROJECT_CURSOR;
- ts->annotate_thickness = 3;
-
- ParticleEditSettings *pset = &ts->particle;
- for (int a = 0; a < ARRAY_SIZE(pset->brush); a++) {
- pset->brush[a].strength = 0.5f;
- pset->brush[a].count = 10;
- }
- pset->brush[PE_BRUSH_CUT].strength = 1.0f;
- }
-
- scene->r.ffcodecdata.audio_mixrate = 48000;
-
- /* set av sync by default */
- scene->audio.flag |= AUDIO_SYNC;
- scene->flag &= ~SCE_FRAME_DROP;
- }
-
- for (FreestyleLineStyle *linestyle = bmain->linestyle.first; linestyle; linestyle = linestyle->id.next) {
- linestyle->flag = LS_SAME_OBJECT | LS_NO_SORTING | LS_TEXTURE;
- linestyle->sort_key = LS_SORT_KEY_DISTANCE_FROM_CAMERA;
- linestyle->integration_type = LS_INTEGRATION_MEAN;
- linestyle->texstep = 1.0;
- linestyle->chain_count = 10;
- }
-
for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) {
for (ScrArea *area = screen->areabase.first; area; area = area->next) {
- for (SpaceLink *space_link = area->spacedata.first; space_link; space_link = space_link->next) {
- if (space_link->spacetype == SPACE_CLIP) {
- SpaceClip *space_clip = (SpaceClip *) space_link;
- space_clip->flag &= ~SC_MANUAL_CALIBRATION;
- }
- }
-
for (ARegion *ar = area->regionbase.first; ar; ar = ar->next) {
/* Remove all stored panels, we want to use defaults (order, open/closed) as defined by UI code here! */
BLI_freelistN(&ar->panels);
@@ -269,166 +96,4 @@ void BLO_update_defaults_startup_blend(Main *bmain)
}
}
}
-
- for (Mesh *me = bmain->mesh.first; me; me = me->id.next) {
- me->smoothresh = DEG2RADF(180.0f);
- me->flag &= ~ME_TWOSIDED;
- }
-
- for (Material *mat = bmain->mat.first; mat; mat = mat->id.next) {
- mat->line_col[0] = mat->line_col[1] = mat->line_col[2] = 0.0f;
- mat->line_col[3] = 1.0f;
- }
-
- {
- Object *ob;
-
- ob = (Object *)BKE_libblock_find_name(bmain, ID_OB, "Camera");
- if (ob) {
- ob->rot[1] = 0.0f;
- }
- }
-
- {
- Brush *br;
-
- br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Fill");
- if (!br) {
- br = BKE_brush_add(bmain, "Fill", OB_MODE_TEXTURE_PAINT);
- id_us_min(&br->id); /* fake user only */
- br->imagepaint_tool = PAINT_TOOL_FILL;
- br->ob_mode = OB_MODE_TEXTURE_PAINT;
- }
-
- /* Vertex/Weight Paint */
- br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Average");
- if (!br) {
- br = BKE_brush_add(bmain, "Average", OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT);
- id_us_min(&br->id); /* fake user only */
- br->vertexpaint_tool = PAINT_BLEND_AVERAGE;
- br->ob_mode = OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT;
- }
- br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Smear");
- if (!br) {
- br = BKE_brush_add(bmain, "Smear", OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT);
- id_us_min(&br->id); /* fake user only */
- br->vertexpaint_tool = PAINT_BLEND_SMEAR;
- br->ob_mode = OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT;
- }
-
- br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Mask");
- if (br) {
- br->imagepaint_tool = PAINT_TOOL_MASK;
- br->ob_mode |= OB_MODE_TEXTURE_PAINT;
- }
-
- /* remove polish brush (flatten/contrast does the same) */
- br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Polish");
- if (br) {
- BKE_libblock_delete(bmain, br);
- }
-
- /* remove brush brush (huh?) from some modes (draw brushes do the same) */
- br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Brush");
- if (br) {
- BKE_libblock_delete(bmain, br);
- }
-
- /* remove draw brush from texpaint (draw brushes do the same) */
- br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Draw");
- if (br) {
- br->ob_mode &= ~OB_MODE_TEXTURE_PAINT;
- }
-
- /* rename twist brush to rotate brush to match rotate tool */
- br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Twist");
- if (br) {
- BKE_libblock_rename(bmain, &br->id, "Rotate");
- }
-
- /* use original normal for grab brush (otherwise flickers with normal weighting). */
- br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Grab");
- if (br) {
- br->flag |= BRUSH_ORIGINAL_NORMAL;
- }
-
- /* increase strength, better for smoothing method */
- br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Blur");
- if (br) {
- br->alpha = 1.0f;
- }
-
- br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Flatten/Contrast");
- if (br) {
- br->flag |= BRUSH_ACCUMULATE;
- }
- }
-
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list