parent
aa3a4973a3
commit
d89fedf266
|
@ -222,10 +222,10 @@ static bool calc_curve_deform(
|
||||||
|
|
||||||
/* zero the axis which is not used,
|
/* zero the axis which is not used,
|
||||||
* the big block of text above now applies to these 3 lines */
|
* the big block of text above now applies to these 3 lines */
|
||||||
quat_apply_track(
|
quat_apply_track(quat,
|
||||||
quat,
|
axis,
|
||||||
axis,
|
(ELEM(axis, 0, 2)) ? 1 :
|
||||||
(ELEM(axis, 0, 2)) ? 1 : 0); /* up flag is a dummy, set so no rotation is done */
|
0); /* up flag is a dummy, set so no rotation is done */
|
||||||
vec_apply_track(cent, axis);
|
vec_apply_track(cent, axis);
|
||||||
cent[index] = 0.0f;
|
cent[index] = 0.0f;
|
||||||
|
|
||||||
|
|
|
@ -2066,7 +2066,9 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
|
||||||
if (srl->freestyleConfig.mode == 0) {
|
if (srl->freestyleConfig.mode == 0) {
|
||||||
srl->freestyleConfig.mode = FREESTYLE_CONTROL_EDITOR_MODE;
|
srl->freestyleConfig.mode = FREESTYLE_CONTROL_EDITOR_MODE;
|
||||||
}
|
}
|
||||||
if (ELEM(srl->freestyleConfig.raycasting_algorithm, FREESTYLE_ALGO_CULLED_ADAPTIVE_CUMULATIVE, FREESTYLE_ALGO_CULLED_ADAPTIVE_TRADITIONAL)) {
|
if (ELEM(srl->freestyleConfig.raycasting_algorithm,
|
||||||
|
FREESTYLE_ALGO_CULLED_ADAPTIVE_CUMULATIVE,
|
||||||
|
FREESTYLE_ALGO_CULLED_ADAPTIVE_TRADITIONAL)) {
|
||||||
srl->freestyleConfig.raycasting_algorithm = 0; /* deprecated */
|
srl->freestyleConfig.raycasting_algorithm = 0; /* deprecated */
|
||||||
srl->freestyleConfig.flags |= FREESTYLE_CULLING;
|
srl->freestyleConfig.flags |= FREESTYLE_CULLING;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1197,8 +1197,7 @@ static void update_voronoi_node_square_distance(bNodeTree *ntree)
|
||||||
NodeTexVoronoi *tex = (NodeTexVoronoi *)node->storage;
|
NodeTexVoronoi *tex = (NodeTexVoronoi *)node->storage;
|
||||||
bNodeSocket *sockDistance = nodeFindSocket(node, SOCK_OUT, "Distance");
|
bNodeSocket *sockDistance = nodeFindSocket(node, SOCK_OUT, "Distance");
|
||||||
if (tex->distance == SHD_VORONOI_EUCLIDEAN &&
|
if (tex->distance == SHD_VORONOI_EUCLIDEAN &&
|
||||||
(ELEM(tex->feature, SHD_VORONOI_F1, SHD_VORONOI_F2)) &&
|
(ELEM(tex->feature, SHD_VORONOI_F1, SHD_VORONOI_F2)) && socket_is_used(sockDistance)) {
|
||||||
socket_is_used(sockDistance)) {
|
|
||||||
bNode *multiplyNode = nodeAddStaticNode(NULL, ntree, SH_NODE_MATH);
|
bNode *multiplyNode = nodeAddStaticNode(NULL, ntree, SH_NODE_MATH);
|
||||||
multiplyNode->custom1 = NODE_MATH_MULTIPLY;
|
multiplyNode->custom1 = NODE_MATH_MULTIPLY;
|
||||||
multiplyNode->locx = node->locx + node->width + 20.0f;
|
multiplyNode->locx = node->locx + node->width + 20.0f;
|
||||||
|
|
|
@ -1695,8 +1695,8 @@ static int insert_text_invoke(bContext *C, wmOperator *op, const wmEvent *event)
|
||||||
|
|
||||||
if (event_val && (ascii || event->utf8_buf[0])) {
|
if (event_val && (ascii || event->utf8_buf[0])) {
|
||||||
/* handle case like TAB (== 9) */
|
/* handle case like TAB (== 9) */
|
||||||
if ((ascii > 31 && ascii < 254 && ascii != 127) || (ELEM(ascii, 13, 10)) ||
|
if ((ascii > 31 && ascii < 254 && ascii != 127) || (ELEM(ascii, 13, 10)) || (ascii == 8) ||
|
||||||
(ascii == 8) || (event->utf8_buf[0])) {
|
(event->utf8_buf[0])) {
|
||||||
|
|
||||||
if (accentcode) {
|
if (accentcode) {
|
||||||
if (ef->pos > 0) {
|
if (ef->pos > 0) {
|
||||||
|
|
|
@ -349,7 +349,8 @@ typedef struct PaintOperation {
|
||||||
bool paint_use_opacity_masking(Brush *brush)
|
bool paint_use_opacity_masking(Brush *brush)
|
||||||
{
|
{
|
||||||
return ((brush->flag & BRUSH_AIRBRUSH) || (brush->flag & BRUSH_DRAG_DOT) ||
|
return ((brush->flag & BRUSH_AIRBRUSH) || (brush->flag & BRUSH_DRAG_DOT) ||
|
||||||
(brush->flag & BRUSH_ANCHORED) || (ELEM(brush->imagepaint_tool, PAINT_TOOL_SMEAR, PAINT_TOOL_SOFTEN)) ||
|
(brush->flag & BRUSH_ANCHORED) ||
|
||||||
|
(ELEM(brush->imagepaint_tool, PAINT_TOOL_SMEAR, PAINT_TOOL_SOFTEN)) ||
|
||||||
(brush->imagepaint_tool == PAINT_TOOL_FILL) ||
|
(brush->imagepaint_tool == PAINT_TOOL_FILL) ||
|
||||||
(brush->flag & BRUSH_USE_GRADIENT) ||
|
(brush->flag & BRUSH_USE_GRADIENT) ||
|
||||||
(brush->mtex.tex && !ELEM(brush->mtex.brush_map_mode,
|
(brush->mtex.tex && !ELEM(brush->mtex.brush_map_mode,
|
||||||
|
|
|
@ -577,8 +577,7 @@ static int rna_enum_bitmask(PropertyRNA *prop)
|
||||||
|
|
||||||
static int rna_color_quantize(PropertyRNA *prop, PropertyDefRNA *dp)
|
static int rna_color_quantize(PropertyRNA *prop, PropertyDefRNA *dp)
|
||||||
{
|
{
|
||||||
return ((prop->type == PROP_FLOAT) &&
|
return ((prop->type == PROP_FLOAT) && (ELEM(prop->subtype, PROP_COLOR, PROP_COLOR_GAMMA)) &&
|
||||||
(ELEM(prop->subtype, PROP_COLOR, PROP_COLOR_GAMMA)) &&
|
|
||||||
(IS_DNATYPE_FLOAT_COMPAT(dp->dnatype) == 0));
|
(IS_DNATYPE_FLOAT_COMPAT(dp->dnatype) == 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue