Commit: 8642395e872090d92571efa35fcad8bda3e7e109 Author: Hans Goudey Date: Tue Feb 16 08:25:33 2021 -0600 Branches: temp-node-error-messages https://developer.blender.org/rB8642395e872090d92571efa35fcad8bda3e7e109
Merge branch 'master' into temp-node-error-messages =================================================================== =================================================================== diff --cc source/blender/nodes/NOD_geometry_exec.hh index 6a7bb2e2220,1149ab51ad0..f1f9a087eed --- a/source/blender/nodes/NOD_geometry_exec.hh +++ b/source/blender/nodes/NOD_geometry_exec.hh @@@ -20,7 -20,7 +20,8 @@@ #include "BKE_attribute_access.hh" #include "BKE_geometry_set.hh" + #include "BKE_geometry_set_instances.hh" +#include "BKE_node_ui_storage.hh" #include "BKE_persistent_data_handle.hh" #include "DNA_node_types.h" _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
