Page MenuHome
Differential D5813 Diff 18351 source/blender/blenloader/intern/versioning_defaults.c

Changeset View

Standalone View

View Options

source/blender/blenloader/intern/versioning_defaults.c

Show All 35 Lines
#include "DNA_userdef_types.h" #include "DNA_userdef_types.h"
#include "DNA_windowmanager_types.h" #include "DNA_windowmanager_types.h"
#include "DNA_workspace_types.h" #include "DNA_workspace_types.h"
#include "DNA_mesh_types.h" #include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h" #include "DNA_meshdata_types.h"
#include "DNA_light_types.h" #include "DNA_light_types.h"
#include "BKE_appdir.h" #include "BKE_appdir.h"
#include "BKE_brush.h"
#include "BKE_colortools.h" #include "BKE_colortools.h"
#include "BKE_layer.h" #include "BKE_layer.h"
#include "BKE_library.h" #include "BKE_library.h"
#include "BKE_main.h" #include "BKE_main.h"
#include "BKE_node.h" #include "BKE_node.h"
#include "BKE_screen.h" #include "BKE_screen.h"
#include "BKE_workspace.h" #include "BKE_workspace.h"
▲ Show 20 Lines • Show All 228 Lines • ▼ Show 20 Lines if (ts->gp_sculpt.cur_primitive == NULL) {
CurveMapping *gp_primitive_curve = ts->gp_sculpt.cur_primitive; CurveMapping *gp_primitive_curve = ts->gp_sculpt.cur_primitive;
BKE_curvemapping_initialize(gp_primitive_curve); BKE_curvemapping_initialize(gp_primitive_curve);
BKE_curvemap_reset(gp_primitive_curve->cm, BKE_curvemap_reset(gp_primitive_curve->cm,
&gp_primitive_curve->clipr, &gp_primitive_curve->clipr,
CURVE_PRESET_BELL, CURVE_PRESET_BELL,
CURVEMAP_SLOPE_POSITIVE); CURVEMAP_SLOPE_POSITIVE);
} }
if (ts->sculpt) {
ts->sculpt->paint.symmetry_flags |= PAINT_SYMMETRY_FEATHER;
}
/* Correct default startup UV's. */ /* Correct default startup UV's. */
Mesh *me = BLI_findstring(&bmain->meshes, "Cube", offsetof(ID, name) + 2); Mesh *me = BLI_findstring(&bmain->meshes, "Cube", offsetof(ID, name) + 2);
if (me && (me->totloop == 24) && (me->mloopuv != NULL)) { if (me && (me->totloop == 24) && (me->mloopuv != NULL)) {
const float uv_values[24][2] = { const float uv_values[24][2] = {
{0.625, 0.50}, {0.875, 0.50}, {0.875, 0.75}, {0.625, 0.75}, {0.375, 0.75}, {0.625, 0.75}, {0.625, 0.50}, {0.875, 0.50}, {0.875, 0.75}, {0.625, 0.75}, {0.375, 0.75}, {0.625, 0.75},
{0.625, 1.00}, {0.375, 1.00}, {0.375, 0.00}, {0.625, 0.00}, {0.625, 0.25}, {0.375, 0.25}, {0.625, 1.00}, {0.375, 1.00}, {0.375, 0.00}, {0.625, 0.00}, {0.625, 0.25}, {0.375, 0.25},
{0.125, 0.50}, {0.375, 0.50}, {0.375, 0.75}, {0.125, 0.75}, {0.375, 0.50}, {0.625, 0.50}, {0.125, 0.50}, {0.375, 0.50}, {0.375, 0.75}, {0.125, 0.75}, {0.375, 0.50}, {0.625, 0.50},
{0.625, 0.75}, {0.375, 0.75}, {0.375, 0.25}, {0.625, 0.25}, {0.625, 0.50}, {0.375, 0.50}, {0.625, 0.75}, {0.375, 0.75}, {0.375, 0.25}, {0.625, 0.25}, {0.625, 0.50}, {0.375, 0.50},
▲ Show 20 Lines • Show All 114 Lines • ▼ Show 20 Lines /* Brushes */
Brush *brush = BLI_findstring(&bmain->brushes, "Grab", offsetof(ID, name) + 2); Brush *brush = BLI_findstring(&bmain->brushes, "Grab", offsetof(ID, name) + 2);
if (brush) { if (brush) {
brush->ob_mode |= OB_MODE_EDIT; brush->ob_mode |= OB_MODE_EDIT;
} }
} }
for (Brush *brush = bmain->brushes.first; brush; brush = brush->id.next) { for (Brush *brush = bmain->brushes.first; brush; brush = brush->id.next) {
brush->blur_kernel_radius = 2; brush->blur_kernel_radius = 2;
brush->curve_preset = BRUSH_CURVE_SMOOTH;
} }
{ {
/* Change the spacing of the Smear brush to 3.0% */ /* Change the spacing of the Smear brush to 3.0% */
Brush *brush = BLI_findstring(&bmain->brushes, "Smear", offsetof(ID, name) + 2); Brush *brush = BLI_findstring(&bmain->brushes, "Smear", offsetof(ID, name) + 2);
if (brush) { if (brush) {
brush->spacing = 3.0; brush->spacing = 3.0;
} }
brush = BLI_findstring(&bmain->brushes, "Grab", offsetof(ID, name) + 2);
if (brush) {
brush->alpha = 0.4f;
}
brush = BLI_findstring(&bmain->brushes, "Scrape/Peaks", offsetof(ID, name) + 2);
if (brush) {
brush->alpha = 1.0f;
brush->spacing = 7;
}
brush = BLI_findstring(&bmain->brushes, "Smooth", offsetof(ID, name) + 2);
if (brush) {
brush->alpha = 0.7f;
}
brush = BLI_findstring(&bmain->brushes, "Draw Sharp", offsetof(ID, name) + 2);
if (!brush) {
brush = BKE_brush_add(bmain, "Draw Sharp", OB_MODE_SCULPT);
id_us_min(&brush->id);
brush->sculpt_tool = SCULPT_TOOL_DRAW_SHARP;
}
brush->curve_preset = BRUSH_CURVE_POW4;
brush->spacing = 5;
brush = BLI_findstring(&bmain->brushes, "Elastic Deform", offsetof(ID, name) + 2);
if (!brush) {
brush = BKE_brush_add(bmain, "Elastic Defrom", OB_MODE_SCULPT);
id_us_min(&brush->id);
brush->sculpt_tool = SCULPT_TOOL_ELASTIC_DEFORM;
}
brush->elastic_deform_volume_preservation = 0.4f;
brush->elastic_deform_type = BRUSH_ELASTIC_DEFORM_GRAB_TRISCALE;
brush = BLI_findstring(&bmain->brushes, "Pose", offsetof(ID, name) + 2);
if (!brush) {
brush = BKE_brush_add(bmain, "Pose", OB_MODE_SCULPT);
id_us_min(&brush->id);
brush->sculpt_tool = SCULPT_TOOL_POSE;
}
brush->flag &= ~BRUSH_ALPHA_PRESSURE;
brush->flag &= ~BRUSH_SPACE;
brush->flag &= ~BRUSH_SPACE_ATTEN;
/* Use the same tool icon color in the brush cursor */
for (Brush *brush = bmain->brushes.first; brush; brush = brush->id.next) {
switch (brush->sculpt_tool) {
brechtUnsubmitted
Not Done
Inline Actions

Is it possible to only add brushes here, and then initialize all the other defaults by doing this, and extending BKE_brush_sculpt_reset as needed?

for (Brush *brush = bmain->brushes.first; brush; brush = brush->id.next) {
  if (brush->sculpt_tool) {
    BKE_brush_sculpt_reset(brush);
  }
}
brecht: Is it possible to only add brushes here, and then initialize all the other defaults by doing…
case SCULPT_TOOL_DRAW:
case SCULPT_TOOL_CLAY:
case SCULPT_TOOL_CLAY_STRIPS:
case SCULPT_TOOL_LAYER:
case SCULPT_TOOL_INFLATE:
case SCULPT_TOOL_BLOB:
case SCULPT_TOOL_CREASE:
brush->add_col[0] = 0.65f;
brush->add_col[1] = 0.85f;
brush->add_col[2] = 0.9f;
brush->sub_col[0] = 0.65f;
brush->sub_col[1] = 0.85f;
brush->sub_col[2] = 0.9f;
break;
case SCULPT_TOOL_SMOOTH:
case SCULPT_TOOL_FLATTEN:
case SCULPT_TOOL_FILL:
case SCULPT_TOOL_SCRAPE:
case SCULPT_TOOL_PINCH:
brush->add_col[0] = 1.0f;
brush->add_col[1] = 0.39f;
brush->add_col[2] = 0.39f;
brush->sub_col[0] = 1.0f;
brush->sub_col[1] = 0.39f;
brush->sub_col[2] = 0.39f;
break;
case SCULPT_TOOL_GRAB:
case SCULPT_TOOL_SNAKE_HOOK:
case SCULPT_TOOL_THUMB:
case SCULPT_TOOL_NUDGE:
case SCULPT_TOOL_ROTATE:
brush->add_col[0] = 1.0f;
brush->add_col[1] = 1.0f;
brush->add_col[2] = 0.39f;
brush->sub_col[0] = 1.0f;
brush->sub_col[1] = 1.0f;
brush->sub_col[2] = 0.39f;
break;
case SCULPT_TOOL_SIMPLIFY:
case SCULPT_TOOL_MASK:
case SCULPT_TOOL_POSE:
case SCULPT_TOOL_DRAW_SHARP:
case SCULPT_TOOL_ELASTIC_DEFORM:
brush->add_col[0] = 0.750000;
brush->add_col[1] = 0.750000;
brush->add_col[2] = 0.750000;
brush->sub_col[0] = 0.750000;
brush->sub_col[1] = 0.750000;
brush->sub_col[2] = 0.750000;
break;
default:
break;
}
}
} }
} }