Merge branch 'blender-v2.90-release'
This commit is contained in:
commit
46aa302400
|
@ -354,7 +354,7 @@ class PREFERENCES_OT_keyitem_restore(Operator):
|
|||
|
||||
item_id: IntProperty(
|
||||
name="Item Identifier",
|
||||
description="Identifier of the item to remove",
|
||||
description="Identifier of the item to restore",
|
||||
)
|
||||
|
||||
@classmethod
|
||||
|
|
|
@ -897,8 +897,8 @@ static DupliObject *face_dupli(const DupliContext *ctx,
|
|||
/* Make offset relative to inst_ob using relative child transform. */
|
||||
mul_mat3_m4_v3(child_imat, obmat[3]);
|
||||
|
||||
/* XXX ugly hack to ensure same behavior as in master this should not be needed,
|
||||
* #Object.parentinv is not consistent outside of parenting. */
|
||||
/* XXX ugly hack to ensure same behavior as in master.
|
||||
* This should not be needed, #Object.parentinv is not consistent outside of parenting. */
|
||||
{
|
||||
float imat[3][3];
|
||||
copy_m3_m4(imat, inst_ob->parentinv);
|
||||
|
|
|
@ -1596,9 +1596,8 @@ static void bake_set_props(wmOperator *op, Scene *scene)
|
|||
|
||||
prop = RNA_struct_find_property(op->ptr, "cage_object");
|
||||
if (!RNA_property_is_set(op->ptr, prop)) {
|
||||
if (bake->cage_object) {
|
||||
RNA_property_string_set(op->ptr, prop, bake->cage_object->id.name + 2);
|
||||
}
|
||||
RNA_property_string_set(
|
||||
op->ptr, prop, (bake->cage_object) ? bake->cage_object->id.name + 2 : "");
|
||||
}
|
||||
|
||||
prop = RNA_struct_find_property(op->ptr, "normal_space");
|
||||
|
|
|
@ -935,7 +935,7 @@ static void rna_def_pointcache_common(StructRNA *srna)
|
|||
prop = RNA_def_property(srna, "frame_start", PROP_INT, PROP_TIME);
|
||||
RNA_def_property_int_sdna(prop, NULL, "startframe");
|
||||
RNA_def_property_range(prop, -MAXFRAME, MAXFRAME);
|
||||
RNA_def_property_ui_range(prop, 1, MAXFRAME, 1, 1);
|
||||
RNA_def_property_ui_range(prop, 0, MAXFRAME, 1, 1);
|
||||
RNA_def_property_ui_text(prop, "Start", "Frame on which the simulation starts");
|
||||
|
||||
prop = RNA_def_property(srna, "frame_end", PROP_INT, PROP_TIME);
|
||||
|
|
Loading…
Reference in New Issue