[Bf-blender-cvs] [f51aa64db35] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

Antonio Vazquez noreply at git.blender.org
Thu Feb 15 16:10:33 CET 2018


Commit: f51aa64db35c90e47e9cfc44901aee948f4efdd4
Author: Antonio Vazquez
Date:   Thu Feb 15 16:01:43 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBf51aa64db35c90e47e9cfc44901aee948f4efdd4

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
index 2fa773b73c1,7a0fc790780..e2580505c4c
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
@@@ -144,14 -144,8 +144,14 @@@ void DepsgraphNodeBuilder::build_view_l
  	if (scene->gpd != NULL) {
  		build_gpencil(scene->gpd);
  	}
 +
 +	/* Palettes. */
 +	BLI_LISTBASE_FOREACH (Palette *, palette, &bmain_->palettes) {
 +		build_palette(palette);
 +	}
 +
  	/* Cache file. */
- 	BLI_LISTBASE_FOREACH (CacheFile *, cachefile, &bmain_->cachefiles) {
+ 	LISTBASE_FOREACH (CacheFile *, cachefile, &bmain_->cachefiles) {
  		build_cachefile(cachefile);
  	}
  	/* Masks. */
diff --cc source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
index 7ef4bc8c755,074d20bb750..1bbe141563a
--- 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,14 -104,8 +104,14 @@@ void DepsgraphRelationBuilder::build_vi
  	if (scene->gpd != NULL) {
  		build_gpencil(scene->gpd);
  	}
 +
 +	/* Palettes. */
 +	BLI_LISTBASE_FOREACH (Palette *, palette, &bmain_->palettes) {
 +		build_palette(palette);
 +	}
 +
  	/* Masks. */
- 	BLI_LISTBASE_FOREACH (Mask *, mask, &bmain_->mask) {
+ 	LISTBASE_FOREACH (Mask *, mask, &bmain_->mask) {
  		build_mask(mask);
  	}
  	/* Movie clips. */



More information about the Bf-blender-cvs mailing list