[Bf-blender-cvs] [79d2ea4f412] functions: cleanup

Jacques Lucke noreply at git.blender.org
Mon Feb 11 18:30:36 CET 2019


Commit: 79d2ea4f4120edad6c5d806ea10859070c03c302
Author: Jacques Lucke
Date:   Mon Feb 11 18:20:27 2019 +0100
Branches: functions
https://developer.blender.org/rB79d2ea4f4120edad6c5d806ea10859070c03c302

cleanup

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

M	release/scripts/startup/function_nodes/nodes/object_transforms.py
M	source/blender/functions/c_wrapper.cpp
M	source/blender/modifiers/intern/MOD_functiondeform.c

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

diff --git a/release/scripts/startup/function_nodes/nodes/object_transforms.py b/release/scripts/startup/function_nodes/nodes/object_transforms.py
index a80f552f270..ba391cb15a8 100644
--- a/release/scripts/startup/function_nodes/nodes/object_transforms.py
+++ b/release/scripts/startup/function_nodes/nodes/object_transforms.py
@@ -6,7 +6,7 @@ class ObjectTransformsNode(bpy.types.Node, FunctionNode):
     bl_idname = "fn_ObjectTransformsNode"
     bl_label = "Object Transforms"
 
-    object = PointerProperty(
+    object: PointerProperty(
         name="Object",
         type=bpy.types.Object,
     )
diff --git a/source/blender/functions/c_wrapper.cpp b/source/blender/functions/c_wrapper.cpp
index ab363bdfad0..4ae3989c9ee 100644
--- a/source/blender/functions/c_wrapper.cpp
+++ b/source/blender/functions/c_wrapper.cpp
@@ -208,7 +208,7 @@ FnFunction FN_testing(bNodeTree *bnodetree)
 {
 	FN::FunctionNodes::FunctionNodeTree tree(bnodetree);
 	auto fgraph = tree.to_function_graph();
-	std::cout << fgraph.graph()->to_dot() << std::endl;
+	//std::cout << fgraph.graph()->to_dot() << std::endl;
 
 	auto fn = FN::SharedFunction::New("Function from Node Tree", fgraph.signature());
 	fn->add_body(FN::function_graph_to_callable(fgraph));
diff --git a/source/blender/modifiers/intern/MOD_functiondeform.c b/source/blender/modifiers/intern/MOD_functiondeform.c
index c8ba88a46af..aa2cd241a0f 100644
--- a/source/blender/modifiers/intern/MOD_functiondeform.c
+++ b/source/blender/modifiers/intern/MOD_functiondeform.c
@@ -51,7 +51,7 @@
 
 #include "FN_functions.h"
 
-bNodeTree *get_node_tree(void)
+static bNodeTree *get_node_tree(void)
 {
 	return (bNodeTree *)G.main->nodetree.first;
 }



More information about the Bf-blender-cvs mailing list