griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.5-release'

Browse Source
This commit is contained in:
Hans Goudey
2025-06-26 10:33:20 -04:00
parent 62726f486b 6fee44760a
commit 9bc67b78ce
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/geometry/intern/realize_instances.cc
View File

@@ -987,6 +987,14 @@ static Map<StringRef, AttributeDomainAndType> gather_attributes_to_propagate(
return;
}
}
if (component->type() == bke::GeometryComponent::Type::Instance) {
if (ELEM(iter.name, "instance_transform", ".reference_index")) {
/* These attributes reference potentially temporary instance components in the set above.
* If we added these names, the string references in the result map would outlive the
* attributes they reference. */
return;
}
}
if (iter.data_type == CD_PROP_STRING) {
/* Propagating string attributes is not supported yet. */
return;
@@ -1037,8 +1045,6 @@ static OrderedAttributes gather_generic_instance_attributes_to_propagate(
Map<StringRef, AttributeDomainAndType> attributes_to_propagate = gather_attributes_to_propagate(
in_geometry_set, bke::GeometryComponent::Type::Instance, options, varied_depth_option);
attributes_to_propagate.pop_try("id");
attributes_to_propagate.pop_try("instance_transform");
attributes_to_propagate.pop_try(".reference_index");
OrderedAttributes ordered_attributes;
for (const auto item : attributes_to_propagate.items()) {
ordered_attributes.ids.add_new(item.key);

11
source/blender/makesrna/intern/rna_space.cc
View File

@@ -1096,6 +1096,14 @@ static void rna_SpaceView3D_shading_use_compositor_update(Main * /*bmain*/,
WM_main_add_notifier(NC_SPACE | ND_SPACE_NODE, nullptr);
}
static void rna_SpaceView3D_retopology_update(Main * /*bmain*/, Scene *scene, PointerRNA * /*ptr*/)
{
/* Retopology can change the visibility of active object.
* There is no actual data change but we just notify the viewport engine to refresh and pickup
* the new visibility. */
DEG_id_tag_update(&scene->id, ID_RECALC_BASE_FLAGS);
}
static void rna_SpaceView3D_region_quadviews_begin(CollectionPropertyIterator *iter,
PointerRNA *ptr)
{
@@ -4943,7 +4951,8 @@ static void rna_def_space_view3d_overlay(BlenderRNA *brna)
"Retopology",
"Hide the solid mesh and offset the overlay towards the view. "
"Selection is occluded by inactive geometry, unless X-Ray is enabled");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D | NS_VIEW3D_SHADING, nullptr);
RNA_def_property_update(
prop, NC_SPACE | ND_SPACE_VIEW3D | NS_VIEW3D_SHADING, "rna_SpaceView3D_retopology_update");
prop = RNA_def_property(srna, "retopology_offset", PROP_FLOAT, PROP_DISTANCE);
RNA_def_property_float_sdna(prop, nullptr, "overlay.retopology_offset");