Merge branch 'blender-v4.0-release'
This commit is contained in:
commit
6f23344a7a
@ -318,4 +318,4 @@ VMutableArray<float> varray_for_mutable_deform_verts(MutableSpan<MDeformVert> dv
|
||||
int defgroup_index);
|
||||
void remove_defgroup_index(MutableSpan<MDeformVert> dverts, int defgroup_index);
|
||||
} // namespace blender::bke
|
||||
#endif
|
||||
#endif
|
||||
|
@ -513,7 +513,7 @@ static uint scanfill(ScanFillContext *sf_ctx, PolyFill *pf, const int flag)
|
||||
sc->vert = eve;
|
||||
sc->edge_first = sc->edge_last = NULL;
|
||||
/* NOTE: debug print only will work for curve poly-fill, union is in use for mesh. */
|
||||
#if 0
|
||||
#if 0
|
||||
if (even->tmp.v == NULL) {
|
||||
eve->tmp.u = verts;
|
||||
}
|
||||
|
@ -54,4 +54,4 @@ void output_aov(vec4 color, float value, uint hash)
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
@ -2260,4 +2260,4 @@ void GRAPH_OT_push_pull(wmOperatorType *ot)
|
||||
0.0f,
|
||||
2.0f);
|
||||
}
|
||||
/** \} */
|
||||
/** \} */
|
||||
|
@ -199,7 +199,7 @@ class NodeGroupVersioning36Test(AbstractNodeGroupInterfaceTest):
|
||||
self.assertEqual(node.node_tree, group, "Node group must use compositor node tree")
|
||||
|
||||
# autopep8: off
|
||||
self.compare_group_to_specs(group, node, [
|
||||
self.compare_group_to_specs(group, node, [
|
||||
SocketSpec("Output Float", "Output_9", "VALUE", hide_value=True, default_value=3.0, min_value=1.0, max_value=1.0),
|
||||
SocketSpec("Output Vector", "Output_10", "VECTOR", subtype="EULER", default_value=( 10, 20, 30), min_value=-10.0, max_value=10.0),
|
||||
SocketSpec("Output Color", "Output_11", "RGBA", default_value=(0, 1, 1, 1)),
|
||||
|
Loading…
Reference in New Issue
Block a user