Merge branch 'blender-v2.90-release'

3 files changed, 5 insertions, 6 deletions

diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c
index 108a952dc69..d69f4a39263 100644
--- a/source/blender/blenkernel/intern/object_dupli.c
+++ b/source/blender/blenkernel/intern/object_dupli.c
@@ -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);
diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c
index cb92fab3cb0..eb8b976320f 100644
--- a/source/blender/editors/object/object_bake_api.c
+++ b/source/blender/editors/object/object_bake_api.c
@@ -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");
diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c
index fa837df682a..bb3756d9cfc 100644
--- a/source/blender/makesrna/intern/rna_object_force.c
+++ b/source/blender/makesrna/intern/rna_object_force.c
@@ -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);