Commit: 6cc85be8c92938c0184213a72395db4174662e1f
Author: Antonio Vazquez
Date: Tue Dec 19 17:54:48 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rB6cc85be8c92938c0184213a72395db4174662e1f
Fix desgraph code missing in merge
===================================================================
M release/datafiles/locale
M release/scripts/addons
M release/scripts/addons_contrib
M source/blender/depsgraph/intern/depsgraph_tag.cc
M source/tools
===================================================================
diff --git a/release/datafiles/locale b/release/datafiles/locale
index 47700dfc983..c93ed11a47b 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 47700dfc9835ef7154bbd34b8725c8abf2f290df
+Subproject commit c93ed11a47b3016cf59711ec16de2e2e94c30e99
diff --git a/release/scripts/addons b/release/scripts/addons
index 6cdbffbc229..371960484a3 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 6cdbffbc229bf263fa4b9b82a6e33b591c32934c
+Subproject commit 371960484a38fc64e0a2635170a41a0d8ab2f6bd
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index e88b7dfc3bd..a8515cfdfe9 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit e88b7dfc3bd68888be2d05437cf50e93e41ef47b
+Subproject commit a8515cfdfe9a98127b592f36fcbe51b7e23b969a
diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc
b/source/blender/depsgraph/intern/depsgraph_tag.cc
index cd3fa24d51a..ad7af14e6ba 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.cc
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cc
@@ -112,10 +112,10 @@ void depsgraph_geometry_tag_to_component(const ID *id,
*component_type = DEG_NODE_TYPE_PARAMETERS;
break;
case ID_GD:
- data_comp =
id_node->find_component(DEG_NODE_TYPE_GEOMETRY);
+ *component_type = DEG_NODE_TYPE_GEOMETRY;
break;
case ID_PAL: /* Palettes */
- data_comp =
id_node->find_component(DEG_NODE_TYPE_PARAMETERS);
+ *component_type = DEG_NODE_TYPE_PARAMETERS;
break;
default:
break;
diff --git a/source/tools b/source/tools
index ccf20e08702..b11375e8906 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit ccf20e08702ee6424edbda01544bb9f8bc386de4
+Subproject commit b11375e89061303401376f7aeae42ac2fd64692a
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
