[Bf-blender-cvs] [78e9821df7f] greasepencil-object: Rename function macro after merge

[Antonio Vazquez]

Commit: 78e9821df7f8a554ffcf5c1dcf3fc6520020d7f0
Author: Antonio Vazquez
Date:   Thu Feb 15 16:10:25 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB78e9821df7f8a554ffcf5c1dcf3fc6520020d7f0

Rename function macro after merge

===================================================================

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_view_layer.cc

===================================================================

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 e2580505c4c..0909deae2e0 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
@@ -146,7 +146,7 @@ void DepsgraphNodeBuilder::build_view_layer(
 	}
 
 	/* Palettes. */
-	BLI_LISTBASE_FOREACH (Palette *, palette, &bmain_->palettes) {
+	LISTBASE_FOREACH (Palette *, palette, &bmain_->palettes) {
 		build_palette(palette);
 	}
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 456cbb00221..a3a031a50a1 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1824,7 +1824,7 @@ void DepsgraphRelationBuilder::build_obdata_geom(Object *object)
 			 * settings change (e.g. when fill.opacity changes on/off,
 			 * we need to rebuild the bGPDstroke->triangles caches)
 			 */
-			BLI_LISTBASE_FOREACH (bGPDpaletteref *, palslot, &gpd->palette_slots) {
+			LISTBASE_FOREACH (bGPDpaletteref *, palslot, &gpd->palette_slots) {
 				if (palslot->palette) {
 					ComponentKey palette_key(&palslot->palette->id, DEG_NODE_TYPE_PARAMETERS);
 					add_relation(palette_key, geometry_key, "Palette -> GP Data");
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 1bbe141563a..ab9c389b3da 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
@@ -106,7 +106,7 @@ void DepsgraphRelationBuilder::build_view_layer(Scene *scene, ViewLayer *view_la
 	}
 
 	/* Palettes. */
-	BLI_LISTBASE_FOREACH (Palette *, palette, &bmain_->palettes) {
+	LISTBASE_FOREACH (Palette *, palette, &bmain_->palettes) {
 		build_palette(palette);
 	}