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

Merge branch 'blender-v4.4-release'

Browse Source
This commit is contained in:
Jacques Lucke
2025-02-11 17:47:45 +01:00
parent 374604f188 1cb2d991f9
commit 4980dc5e29
7 changed files with 92 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/BKE_node_tree_update.hh
View File

@@ -38,6 +38,7 @@ void BKE_ntree_update_tag_node_new(bNodeTree *ntree, bNode *node);
void BKE_ntree_update_tag_node_removed(bNodeTree *ntree);
void BKE_ntree_update_tag_node_mute(bNodeTree *ntree, bNode *node);
void BKE_ntree_update_tag_node_internal_link(bNodeTree *ntree, bNode *node);
void BKE_ntree_update_tag_node_type(bNodeTree *ntree, bNode *node);
void BKE_ntree_update_tag_socket_property(bNodeTree *ntree, bNodeSocket *socket);
void BKE_ntree_update_tag_socket_new(bNodeTree *ntree, bNodeSocket *socket);

21
source/blender/blenkernel/intern/grease_pencil.cc
View File

@@ -2181,6 +2181,23 @@ static void grease_pencil_do_layer_adjustments(GreasePencil &grease_pencil)
}
}
static void grease_pencil_evaluate_layers(GreasePencil &grease_pencil)
{
using namespace blender;
using namespace blender::bke::greasepencil;
/* Copy the layer cache into an array here, because removing a layer will invalidate the layer
* cache. This will only copy the pointers to the layers, not the layers themselves. */
Array<Layer *> layers = grease_pencil.layers_for_write();
for (Layer *layer : layers) {
if (!layer->is_visible()) {
/* Remove layer from evaluated data. */
grease_pencil.remove_layer(*layer);
}
}
}
void BKE_grease_pencil_data_update(Depsgraph *depsgraph, Scene *scene, Object *object)
{
using namespace blender;
@@ -2188,10 +2205,12 @@ void BKE_grease_pencil_data_update(Depsgraph *depsgraph, Scene *scene, Object *o
/* Free any evaluated data and restore original data. */
BKE_object_free_derived_caches(object);
/* Evaluate modifiers. */
GreasePencil *grease_pencil = static_cast<GreasePencil *>(object->data);
/* Store the frame that this grease pencil is evaluated on. */
grease_pencil->runtime->eval_frame = int(DEG_get_ctime(depsgraph));
/* This will remove layers that aren't visible. */
grease_pencil_evaluate_layers(*grease_pencil);
GeometrySet geometry_set = GeometrySet::from_grease_pencil(grease_pencil,
GeometryOwnershipType::ReadOnly);
/* The layer adjustments for tinting and radii offsets are applied before modifier evaluation.

50
source/blender/blenkernel/intern/node.cc
View File

@@ -1535,6 +1535,7 @@ static void node_set_typeinfo(const bContext *C,
else {
node->typeinfo = &NodeTypeUndefined;
}
BKE_ntree_update_tag_node_type(ntree, node);
}
/* WARNING: default_value must either be null or match the typeinfo at this point.
@@ -1658,6 +1659,34 @@ bNodeTreeType *node_tree_type_find(const StringRef idname)
return *value;
}
static void defer_free_tree_type(bNodeTreeType *tree_type)
{
static ResourceScope scope;
scope.add_destruct_call([tree_type]() { MEM_delete(tree_type); });
}
static void defer_free_node_type(bNodeType *ntype)
{
static ResourceScope scope;
scope.add_destruct_call([ntype]() {
/* May be null if the type is statically allocated. */
if (ntype->free_self) {
ntype->free_self(ntype);
}
});
}
static void defer_free_socket_type(bNodeSocketType *stype)
{
static ResourceScope scope;
scope.add_destruct_call([stype]() {
/* May be null if the type is statically allocated. */
if (stype->free_self) {
stype->free_self(stype);
}
});
}
void node_tree_type_add(bNodeTreeType *nt)
{
get_node_tree_type_map().add(nt);
@@ -1674,7 +1703,11 @@ static void ntree_free_type(void *treetype_v)
/* Probably not. It is pretty much expected we want to update G_MAIN here I think -
* or we'd want to update *all* active Mains, which we cannot do anyway currently. */
update_typeinfo(G_MAIN, nullptr, treetype, nullptr, nullptr, true);
MEM_delete(treetype);
/* Defer freeing the tree type, because it may still be referenced by trees in depsgraph
* copies. We can't just remove these tree types, because the depsgraph may exist completely
* separate from original data. */
defer_free_tree_type(treetype);
}
void node_tree_type_free_link(const bNodeTreeType *nt)
@@ -1719,13 +1752,15 @@ static void node_free_type(void *nodetype_v)
* or we'd want to update *all* active Mains, which we cannot do anyway currently. */
update_typeinfo(G_MAIN, nullptr, nullptr, nodetype, nullptr, true);
/* Setting this to null is necessary for the case of static node types. When running tests,
* they may be registered and unregistered multiple times. */
delete nodetype->static_declaration;
nodetype->static_declaration = nullptr;
/* Can be null when the type is not dynamically allocated. */
if (nodetype->free_self) {
nodetype->free_self(nodetype);
}
/* Defer freeing the node type, because it may still be referenced by nodes in depsgraph
* copies. We can't just remove these node types, because the depsgraph may exist completely
* separate from original data. */
defer_free_node_type(nodetype);
}
void node_register_type(bNodeType *nt)
@@ -1813,7 +1848,10 @@ static void node_free_socket_type(void *socktype_v)
* or we'd want to update *all* active Mains, which we cannot do anyway currently. */
update_typeinfo(G_MAIN, nullptr, nullptr, nullptr, socktype, true);
socktype->free_self(socktype);
/* Defer freeing the socket type, because it may still be referenced by nodes in depsgraph
* copies. We can't just remove these socket types, because the depsgraph may exist completely
* separate from original data. */
defer_free_socket_type(socktype);
}
void node_register_socket_type(bNodeSocketType *st)

11
source/blender/blenkernel/intern/node_tree_update.cc
View File

@@ -585,6 +585,12 @@ class NodeTreeMainUpdater {
nodes::update_node_declaration_and_sockets(ntree, *node);
}
}
else if (node->is_undefined()) {
/* If a node has become undefined (it generally was unregistered from Python), it does
* not have a declaration anymore. */
delete node->runtime->declaration;
node->runtime->declaration = nullptr;
}
if (ntype.updatefunc) {
ntype.updatefunc(&ntree, node);
}
@@ -1711,6 +1717,11 @@ void BKE_ntree_update_tag_node_new(bNodeTree *ntree, bNode *node)
add_node_tag(ntree, node, NTREE_CHANGED_NODE_PROPERTY);
}
void BKE_ntree_update_tag_node_type(bNodeTree *ntree, bNode *node)
{
add_node_tag(ntree, node, NTREE_CHANGED_NODE_PROPERTY);
}
void BKE_ntree_update_tag_socket_property(bNodeTree *ntree, bNodeSocket *socket)
{
add_socket_tag(ntree, socket, NTREE_CHANGED_SOCKET_PROPERTY);

7
source/blender/makesrna/intern/rna_node_socket.cc
View File

@@ -130,7 +130,7 @@ static void rna_NodeSocket_draw_color_simple(const blender::bke::bNodeSocketType
RNA_parameter_list_free(&list);
}
static bool rna_NodeSocket_unregister(Main * /*bmain*/, StructRNA *type)
static bool rna_NodeSocket_unregister(Main *bmain, StructRNA *type)
{
blender::bke::bNodeSocketType *st = static_cast<blender::bke::bNodeSocketType *>(
RNA_struct_blender_type_get(type));
@@ -145,10 +145,11 @@ static bool rna_NodeSocket_unregister(Main * /*bmain*/, StructRNA *type)
/* update while blender is running */
WM_main_add_notifier(NC_NODE | NA_EDITED, nullptr);
BKE_main_ensure_invariants(*bmain);
return true;
}
static StructRNA *rna_NodeSocket_register(Main * /*bmain*/,
static StructRNA *rna_NodeSocket_register(Main *bmain,
ReportList *reports,
void *data,
const char *identifier,
@@ -213,7 +214,7 @@ static StructRNA *rna_NodeSocket_register(Main * /*bmain*/,
/* update while blender is running */
WM_main_add_notifier(NC_NODE | NA_EDITED, nullptr);
BKE_main_ensure_invariants(*bmain);
return st->ext_socket.srna;
}

10
source/blender/makesrna/intern/rna_nodetree.cc
View File

@@ -1021,7 +1021,7 @@ static bool rna_NodeTree_valid_socket_type(blender::bke::bNodeTreeType *ntreetyp
return valid;
}
static bool rna_NodeTree_unregister(Main * /*bmain*/, StructRNA *type)
static bool rna_NodeTree_unregister(Main *bmain, StructRNA *type)
{
blender::bke::bNodeTreeType *nt = static_cast<blender::bke::bNodeTreeType *>(
RNA_struct_blender_type_get(type));
@@ -1037,6 +1037,7 @@ static bool rna_NodeTree_unregister(Main * /*bmain*/, StructRNA *type)
/* update while blender is running */
WM_main_add_notifier(NC_NODE | NA_EDITED, nullptr);
BKE_main_ensure_invariants(*bmain);
return true;
}
@@ -1116,7 +1117,7 @@ static StructRNA *rna_NodeTree_register(Main *bmain,
/* update while blender is running */
WM_main_add_notifier(NC_NODE | NA_EDITED, nullptr);
BKE_main_ensure_invariants(*bmain);
return nt->rna_ext.srna;
}
@@ -1931,7 +1932,7 @@ static void rna_Node_is_registered_node_type_runtime(bContext * /*C*/,
RNA_parameter_set_lookup(parms, "result", &result);
}
static bool rna_Node_unregister(Main * /*bmain*/, StructRNA *type)
static bool rna_Node_unregister(Main *bmain, StructRNA *type)
{
blender::bke::bNodeType *nt = static_cast<blender::bke::bNodeType *>(
RNA_struct_blender_type_get(type));
@@ -1948,6 +1949,7 @@ static bool rna_Node_unregister(Main * /*bmain*/, StructRNA *type)
/* update while blender is running */
WM_main_add_notifier(NC_NODE | NA_EDITED, nullptr);
BKE_main_ensure_invariants(*bmain);
return true;
}
@@ -2088,7 +2090,7 @@ static StructRNA *rna_Node_register(Main *bmain,
/* update while blender is running */
WM_main_add_notifier(NC_NODE | NA_EDITED, nullptr);
BKE_main_ensure_invariants(*bmain);
return nt->rna_ext.srna;
}

6
source/blender/nodes/intern/geometry_nodes_repeat_zone.cc
View File

@@ -201,6 +201,12 @@ class LazyFunctionForRepeatZone : public LazyFunction {
const int iterations = std::max<int>(
0, params.get_input<SocketValueVariant>(zone_info_.indices.inputs.main[0]).get<int>());
if (iterations >= 10) {
/* Constructing and running the repeat zone has some overhead so that it's probably worth
* trying to do something else in the meantime already. */
lazy_threading::send_hint();
}
/* Show a warning when the inspection index is out of range. */
if (node_storage.inspection_index > 0) {
if (node_storage.inspection_index >= iterations) {