From a6646fb0d02395d100cbaaa8aef7171108e4d2f2 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Tue, 19 May 2020 15:17:54 +0200 Subject: Fix T76881: Changing "Use Speed Vectors" deletes all existing cache Reviewers: sebbas --- source/blender/makesrna/intern/rna_fluid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/makesrna/intern/rna_fluid.c b/source/blender/makesrna/intern/rna_fluid.c index db34f9d7e71..473c30e5d44 100644 --- a/source/blender/makesrna/intern/rna_fluid.c +++ b/source/blender/makesrna/intern/rna_fluid.c @@ -1754,7 +1754,7 @@ static void rna_def_fluid_domain_settings(BlenderRNA *brna) "Caches velocities of mesh vertices. These will be used " "(automatically) when rendering with motion blur enabled"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); - RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_domain_reset"); + RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_meshcache_reset"); prop = RNA_def_property(srna, "mesh_particle_radius", PROP_FLOAT, PROP_NONE); RNA_def_property_range(prop, 0.0, 10.0); -- cgit v1.2.3 From 9ac4e4a1c71e163340871d24e40d7f89f4f2b539 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Tue, 19 May 2020 15:20:09 +0200 Subject: Fix T76375: UDIM Rectangular Tiled Image EEVEE freezes Blender MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When packing the image the height of the tile was checked to the width of the packing area. This resulted that the tile was ignored. Reviewed By: Clément Foucault Differential Revision: https://developer.blender.org/D7784 --- release/datafiles/locale | 2 +- release/scripts/addons | 2 +- source/blender/blenlib/intern/boxpack_2d.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/release/datafiles/locale b/release/datafiles/locale index 1d9b8b2ffa6..0fd21a7cc38 160000 --- a/release/datafiles/locale +++ b/release/datafiles/locale @@ -1 +1 @@ -Subproject commit 1d9b8b2ffa67a8832073acf316150b2dfaa2db02 +Subproject commit 0fd21a7cc382066d184fda8153f925bb825af2c6 diff --git a/release/scripts/addons b/release/scripts/addons index 47a32a5370d..9a9832d5d7f 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit 47a32a5370d36942674621e5a03e57e8dd4986d8 +Subproject commit 9a9832d5d7fe61a446516f2e2722f8356bd7e709 diff --git a/source/blender/blenlib/intern/boxpack_2d.c b/source/blender/blenlib/intern/boxpack_2d.c index 6ecadeecec5..83866f766df 100644 --- a/source/blender/blenlib/intern/boxpack_2d.c +++ b/source/blender/blenlib/intern/boxpack_2d.c @@ -705,7 +705,7 @@ void BLI_box_pack_2d_fixedarea(ListBase *boxes, int width, int height, ListBase LISTBASE_FOREACH_MUTABLE (FixedSizeBoxPack *, box, boxes) { LISTBASE_FOREACH (FixedSizeBoxPack *, space, &spaces) { /* Skip this space if it's too small. */ - if (box->w > space->w || box->h > space->w) { + if (box->w > space->w || box->h > space->h) { continue; } -- cgit v1.2.3 From 9ccc73ade8a25db5bb6bf17ee870870c2826efa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 19 May 2020 14:58:24 +0200 Subject: Animation: Make dopesheet filter labels consistent There are three different label styles for the three Dopesheet filter labels: - "Display Hidden", which uses "Display" rather than "Show" as the other two options. - "Show Errors", which does not use the word "only" to indicate it will hide all the non-error channels. - "Only Selected", so no "show" or "display" in the label at all. This commit changes: - Always use the word "Show", not "Display". - Always use the word "Only" when enabling the filter hides everything else. Reviewed By: billreynish Differential Revision: https://developer.blender.org/D7742 --- source/blender/makesrna/intern/rna_action.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c index a3a89db66be..facbf8d59cc 100644 --- a/source/blender/makesrna/intern/rna_action.c +++ b/source/blender/makesrna/intern/rna_action.c @@ -345,14 +345,14 @@ static void rna_def_dopesheet(BlenderRNA *brna) prop = RNA_def_property(srna, "show_only_selected", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_ONLYSEL); RNA_def_property_ui_text( - prop, "Only Selected", "Only include channels relating to selected objects and data"); + prop, "Only Show Selected", "Only include channels relating to selected objects and data"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_SELECT_OFF, 0); RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL); prop = RNA_def_property(srna, "show_hidden", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_INCL_HIDDEN); RNA_def_property_ui_text( - prop, "Display Hidden", "Include channels from objects/bone that are not visible"); + prop, "Show Hidden", "Include channels from objects/bone that are not visible"); RNA_def_property_ui_icon(prop, ICON_OBJECT_HIDDEN, 0); RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL); @@ -368,8 +368,9 @@ static void rna_def_dopesheet(BlenderRNA *brna) /* Debug Filtering Settings */ prop = RNA_def_property(srna, "show_only_errors", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_ONLY_ERRORS); - RNA_def_property_ui_text( - prop, "Show Errors", "Only include F-Curves and drivers that are disabled or have errors"); + RNA_def_property_ui_text(prop, + "Only Show Errors", + "Only include F-Curves and drivers that are disabled or have errors"); RNA_def_property_ui_icon(prop, ICON_ERROR, 0); RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL); -- cgit v1.2.3