blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Merge branch 'blender-v2.92-release'

This commit is contained in:
Sergey Sharybin 2021-01-27 14:25:28 +01:00
parent c92b5622ad cd24712c2c
commit 8e52d76bcd
7 changed files with 9 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -387,9 +387,7 @@ void DepsgraphNodeBuilder::build_id(ID *id)
if (id == nullptr) {
return;
}
const ID_Type id_type = GS(id->name);
switch (id_type) {
switch (GS(id->name)) {
case ID_AC:
build_action((bAction *)id);
break;
@ -479,39 +477,13 @@ void DepsgraphNodeBuilder::build_id(ID *id)
case ID_SIM:
build_simulation((Simulation *)id);
break;
case ID_PA:
build_particle_settings((ParticleSettings *)id);
break;
case ID_GD:
build_gpencil((bGPdata *)id);
break;
case ID_LI:
case ID_IP:
case ID_SCR:
case ID_VF:
case ID_BR:
case ID_WM:
case ID_PAL:
case ID_PC:
case ID_WS:
BLI_assert(!deg_copy_on_write_is_needed(id_type));
build_generic_id(id);
default:
fprintf(stderr, "Unhandled ID %s\n", id->name);
BLI_assert(!"Should never happen");
break;
}
}
void DepsgraphNodeBuilder::build_generic_id(ID *id)
{
if (built_map_.checkIsBuiltAndTag(id)) {
return;
}
build_idproperties(id->properties);
build_animdata(id);
build_parameters(id);
}
static void build_idproperties_callback(IDProperty *id_property, void *user_data)
{
DepsgraphNodeBuilder *builder = reinterpret_cast<DepsgraphNodeBuilder *>(user_data);

3
source/blender/depsgraph/intern/builder/deg_builder_nodes.h
View File

@ -152,9 +152,6 @@ class DepsgraphNodeBuilder : public DepsgraphBuilder {
virtual void build_id(ID *id);
/* Build function for ID types that do not need their own build_xxx() function. */
virtual void build_generic_id(ID *id);
virtual void build_idproperties(IDProperty *id_property);
virtual void build_scene_render(Scene *scene, ViewLayer *view_layer);

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

@ -484,9 +484,7 @@ void DepsgraphRelationBuilder::build_id(ID *id)
if (id == nullptr) {
return;
}
const ID_Type id_type = GS(id->name);
switch (id_type) {
switch (GS(id->name)) {
case ID_AC:
build_action((bAction *)id);
break;
@ -562,40 +560,13 @@ void DepsgraphRelationBuilder::build_id(ID *id)
case ID_SIM:
build_simulation((Simulation *)id);
break;
case ID_PA:
build_particle_settings((ParticleSettings *)id);
break;
case ID_GD:
build_gpencil((bGPdata *)id);
break;
case ID_LI:
case ID_IP:
case ID_SCR:
case ID_VF:
case ID_BR:
case ID_WM:
case ID_PAL:
case ID_PC:
case ID_WS:
BLI_assert(!deg_copy_on_write_is_needed(id_type));
build_generic_id(id);
default:
fprintf(stderr, "Unhandled ID %s\n", id->name);
BLI_assert(!"Should never happen");
break;
}
}
void DepsgraphRelationBuilder::build_generic_id(ID *id)
{
if (built_map_.checkIsBuiltAndTag(id)) {
return;
}
build_idproperties(id->properties);
build_animdata(id);
build_parameters(id);
}
static void build_idproperties_callback(IDProperty *id_property, void *user_data)
{
DepsgraphRelationBuilder *builder = reinterpret_cast<DepsgraphRelationBuilder *>(user_data);

3
source/blender/depsgraph/intern/builder/deg_builder_relations.h
View File

@ -198,9 +198,6 @@ class DepsgraphRelationBuilder : public DepsgraphBuilder {
virtual void build_id(ID *id);
/* Build function for ID types that do not need their own build_xxx() function. */
virtual void build_generic_id(ID *id);
virtual void build_idproperties(IDProperty *id_property);
virtual void build_scene_render(Scene *scene, ViewLayer *view_layer);

8
source/blender/depsgraph/intern/depsgraph.cc
View File

@ -142,14 +142,6 @@ static void clear_id_nodes_conditional(Depsgraph::IDDepsNodes *id_nodes, const F
* datablock for her own dirty needs. */
continue;
}
if (id_node->id_cow == id_node->id_orig) {
/* Copy-on-write version is not needed for this ID type.
*
* NOTE: Is important to not de-reference the original datablock here because it might be
* freed already (happens during main database free when some IDs are freed prior to a
* scene). */
continue;
}
if (!deg_copy_on_write_is_expanded(id_node->id_cow)) {
continue;
}

4
source/blender/depsgraph/intern/depsgraph_tag.cc
View File

@ -265,10 +265,6 @@ void depsgraph_update_editors_tag(Main *bmain, Depsgraph *graph, ID *id)
void depsgraph_id_tag_copy_on_write(Depsgraph *graph, IDNode *id_node, eUpdateSource update_source)
{
ComponentNode *cow_comp = id_node->find_component(NodeType::COPY_ON_WRITE);
if (cow_comp == nullptr) {
BLI_assert(!deg_copy_on_write_is_needed(GS(id_node->id_orig->name)));
return;
}
cow_comp->tag_update(graph, update_source);
}

3
source/blender/makesdna/DNA_ID.h
View File

@ -530,8 +530,7 @@ typedef enum ID_Type {
#define ID_IS_ASSET(_id) (((const ID *)(_id))->asset_data != NULL)
/* Check whether datablock type is covered by copy-on-write. */
#define ID_TYPE_IS_COW(_id_type) \
(!ELEM(_id_type, ID_LI, ID_IP, ID_SCR, ID_VF, ID_BR, ID_WM, ID_PAL, ID_PC, ID_WS, ID_IM))
#define ID_TYPE_IS_COW(_id_type) (!ELEM(_id_type, ID_BR, ID_PAL, ID_IM))
#ifdef GS
# undef GS