[Bf-blender-cvs] [da8ef484a58] greasepencil-object: Remove Palette animation Depsgraph node
Antonio Vazquez
noreply at git.blender.org
Fri Apr 27 10:52:05 CEST 2018
Commit: da8ef484a581ebadee3f58cc67760e27db972efe
Author: Antonio Vazquez
Date: Fri Apr 27 10:51:58 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBda8ef484a581ebadee3f58cc67760e27db972efe
Remove Palette animation Depsgraph node
As the Palette animation has been removed, these modules must be removed.
===================================================================
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/builder/deg_builder_nodes.h
M source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.h
M source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
===================================================================
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 8806098212d..2ac0f880660 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -1360,19 +1360,6 @@ void DepsgraphNodeBuilder::build_gpencil(bGPdata *gpd)
build_animdata(gpd_id);
}
-void DepsgraphNodeBuilder::build_palette(Palette *palette)
-{
- ID *palette_id = &palette->id;
-
- /* palette itself */
- add_operation_node(palette_id,
- DEG_NODE_TYPE_PARAMETERS,
- NULL,
- DEG_OPCODE_PARAMETERS_EVAL);
- /* palette's animdata */
- build_animdata(palette_id);
-}
-
void DepsgraphNodeBuilder::build_cachefile(CacheFile *cache_file)
{
ID *cache_file_id = &cache_file->id;
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
index 0e69f24cfe6..249f8a23fb5 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
@@ -200,7 +200,6 @@ struct DepsgraphNodeBuilder {
void build_world(World *world);
void build_compositor(Scene *scene);
void build_gpencil(bGPdata *gpd);
- void build_palette(Palette *palette);
void build_cachefile(CacheFile *cache_file);
void build_mask(Mask *mask);
void build_movieclip(MovieClip *clip);
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
index 578903c4022..750b0054ee5 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
@@ -123,12 +123,6 @@ void DepsgraphNodeBuilder::build_view_layer(
if (scene->gpd != NULL) {
build_gpencil(scene->gpd);
}
-
- /* Palettes. */
- LISTBASE_FOREACH (Palette *, palette, &bmain_->palettes) {
- build_palette(palette);
- }
-
/* Cache file. */
LISTBASE_FOREACH (CacheFile *, cachefile, &bmain_->cachefiles) {
build_cachefile(cachefile);
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 47db0a0b891..408127032ab 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1945,12 +1945,6 @@ void DepsgraphRelationBuilder::build_gpencil(bGPdata *gpd)
// TODO: parent object (when that feature is implemented)
}
-void DepsgraphRelationBuilder::build_palette(Palette *palette)
-{
- /* animation */
- build_animdata(&palette->id);
-}
-
void DepsgraphRelationBuilder::build_cachefile(CacheFile *cache_file) {
/* Animation. */
build_animdata(&cache_file->id);
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
index 1fd3d81857a..b96bea51a3a 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
@@ -246,7 +246,6 @@ struct DepsgraphRelationBuilder
void build_texture(Tex *tex);
void build_compositor(Scene *scene);
void build_gpencil(bGPdata *gpd);
- void build_palette(Palette *palette);
void build_cachefile(CacheFile *cache_file);
void build_mask(Mask *mask);
void build_movieclip(MovieClip *clip);
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
index 0a499e93626..c97fa3b3a5a 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
@@ -104,12 +104,6 @@ void DepsgraphRelationBuilder::build_view_layer(Scene *scene, ViewLayer *view_la
if (scene->gpd != NULL) {
build_gpencil(scene->gpd);
}
-
- /* Palettes. */
- LISTBASE_FOREACH (Palette *, palette, &bmain_->palettes) {
- build_palette(palette);
- }
-
/* Masks. */
LISTBASE_FOREACH (Mask *, mask, &bmain_->mask) {
build_mask(mask);
More information about the Bf-blender-cvs
mailing list