blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Merge branch 'blender-v2.90-release'

This commit is contained in:
Philipp Oeser 2020-08-13 11:50:07 +02:00
parent 7c380119a7 ada98869df
commit 46aa302400
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_operators/userpref.py
View File

@ -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

4
source/blender/blenkernel/intern/object_dupli.c
View File

@ -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);

5
source/blender/editors/object/object_bake_api.c
View File

@ -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");

2
source/blender/makesrna/intern/rna_object_force.c
View File

@ -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);