Commit: b3639670ee001cc77480cdc8db54ce517d992e3b Author: Hans Goudey Date: Mon Aug 23 14:10:39 2021 -0500 Branches: temp-geometry-nodes-fields-prototype https://developer.blender.org/rBb3639670ee001cc77480cdc8db54ce517d992e3b
Merge branch 'master' into temp-geometry-nodes-fields-prototype =================================================================== =================================================================== diff --cc source/blender/modifiers/intern/MOD_nodes.cc index 57295f5e132,620c7ef438a..98521b43f52 --- a/source/blender/modifiers/intern/MOD_nodes.cc +++ b/source/blender/modifiers/intern/MOD_nodes.cc @@@ -85,10 -84,9 +85,11 @@@ #include "NOD_derived_node_tree.hh" #include "NOD_geometry.h" #include "NOD_geometry_nodes_eval_log.hh" - #include "NOD_node_tree_multi_function.hh" + + #include "FN_multi_function.hh" +#include "WM_types.h" + using blender::destruct_ptr; using blender::float3; using blender::FunctionRef; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
