blender
/
blender
136
406
Fork 587
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Merge branch 'blender-v2.92-release'

This commit is contained in:
Philipp Oeser 2021-01-29 10:21:17 +01:00
parent 27e2c5ab78 3fb5e83867
commit 45d952e045
4 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
release/scripts/startup/bl_ui/space_view3d.py
View File

@ -6247,17 +6247,20 @@ class VIEW3D_PT_overlay_edit_mesh(Panel):
overlay = view.overlay
display_all = overlay.show_overlays
is_any_solid_shading = not (shading.show_xray or (shading.type == 'WIREFRAME'))
col = layout.column()
col.active = display_all
split = col.split()
sub = split.column()
sub.active = not ((shading.type == 'WIREFRAME') or shading.show_xray)
sub.active = is_any_solid_shading
sub.prop(overlay, "show_edges", text="Edges")
sub = split.column()
sub.prop(overlay, "show_faces", text="Faces")
sub = split.column()
sub.active = is_any_solid_shading
sub.prop(overlay, "show_face_center", text="Center")
row = col.row(align=True)

5
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
View File

@ -650,6 +650,11 @@ void DepsgraphNodeBuilder::build_object(int base_index,
if (object->particlesystem.first != nullptr) {
build_particle_systems(object, is_visible);
}
/* Force field Texture. */
if ((object->pd != nullptr) && (object->pd->forcefield == PFIELD_TEXTURE) &&
(object->pd->tex != nullptr)) {
build_texture(object->pd->tex);
}
/* Proxy object to copy from. */
build_object_proxy_from(object, is_visible);
build_object_proxy_group(object, is_visible);

17
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
View File

@ -434,6 +434,13 @@ void DepsgraphRelationBuilder::add_particle_forcefield_relations(const Operation
add_relation(mod_key, key, name);
}
/* Force field Texture. */
if ((relation->pd != nullptr) && (relation->pd->forcefield == PFIELD_TEXTURE) &&
(relation->pd->tex != nullptr)) {
ComponentKey tex_key(&relation->pd->tex->id, NodeType::GENERIC_DATABLOCK);
add_relation(tex_key, key, "Force field Texture");
}
/* Smoke flow relations. */
if (relation->pd->forcefield == PFIELD_FLUIDFLOW && relation->pd->f_source) {
ComponentKey trf_key(&relation->pd->f_source->id, NodeType::TRANSFORM);
@ -712,6 +719,11 @@ void DepsgraphRelationBuilder::build_object(Object *object)
if (object->particlesystem.first != nullptr) {
build_particle_systems(object);
}
/* Force field Texture. */
if ((object->pd != nullptr) && (object->pd->forcefield == PFIELD_TEXTURE) &&
(object->pd->tex != nullptr)) {
build_texture(object->pd->tex);
}
/* Proxy object to copy from. */
build_object_proxy_from(object);
build_object_proxy_group(object);
@ -1725,6 +1737,11 @@ void DepsgraphRelationBuilder::build_rigidbody(Scene *scene)
ComponentKey effector_geometry_key(&effector_relation->ob->id, NodeType::GEOMETRY);
add_relation(effector_geometry_key, rb_init_key, "RigidBody Field");
}
if ((effector_relation->pd->forcefield == PFIELD_TEXTURE) &&
(effector_relation->pd->tex != nullptr)) {
ComponentKey tex_key(&effector_relation->pd->tex->id, NodeType::GENERIC_DATABLOCK);
add_relation(tex_key, rb_init_key, "Force field Texture");
}
}
}
/* Objects. */

5
source/blender/makesrna/intern/rna_space.c
View File

@ -4038,7 +4038,10 @@ static void rna_def_space_view3d_overlay(BlenderRNA *brna)
prop = RNA_def_property(srna, "show_face_center", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "overlay.edit_flag", V3D_OVERLAY_EDIT_FACE_DOT);
RNA_def_property_ui_text(prop, "Draw Face Center", "Display face center");
RNA_def_property_ui_text(
prop,
"Draw Face Center",
"Display face center when face selection is enabled in solid shading modes");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
prop = RNA_def_property(srna, "show_edge_crease", PROP_BOOLEAN, PROP_NONE);