rebase

This was caused by operator priority trying to use
`friend VecBase operator*(const VecBase &a, FactorT b)`.

Adding tests as these were not covered.

@@ -3456,3 +3456,3 @@
 }
 
-bool ntreeHasTree(const bNodeTree *ntree, const bNodeTree *lookup)
+bool ntreeContainsTree(const bNodeTree *parent_tree, const bNodeTree *sub_tree)

@@ -12722,0 +12729,4 @@
+      func,
+      "Check if the node tree contains another. Used to avoid creating recursive node groups");
+  parm = RNA_def_pointer(
+      func, "sub_tree", "NodeTree", "Node Group", "Node group for recursive check");

@@ -507,1 +507,3 @@
-bool ntreeHasTree(const struct bNodeTree *ntree, const struct bNodeTree *lookup);
+
+/**
+ * Check recursively whether a sub node tree contain in host tree.

@@ -508,0 +508,4 @@
+/**
+ * Check recursively whether a sub node tree contain in host tree.
+ */
+bool ntreeContainsTree(const struct bNodeTree *parent_tree, const struct bNodeTree *sub_tree);

@@ -3468,0 +3461,4 @@
+{
+  parent_tree->ensure_topology_cache();
+  for (const bNode *node_group : parent_tree->group_nodes()) {
+    const bNodeTree *tree = reinterpret_cast<bNodeTree *>(node_group->id);