blender
/
blender
137
426
Fork 615
Code Issues 6.3k Pull Requests 791 Projects 19 Wiki Activity

WIP: Volume grid attribute support in geometry nodes #110044

Closed
Lukas Tönne wants to merge 130 commits from LukasTonne/blender:geometry-nodes-flip into main
pull from: LukasTonne/blender:geometry-nodes-flip
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 7 Commits 130 Files Changed 80 +19 -20
7 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 66cb07d056 - Show all commits

4
source/blender/nodes/geometry/nodes/node_geo_input_grid_coordinate.cc
View File

@ -14,8 +14,8 @@
#include "node_geometry_util.hh"
#include "UI_interface.h"
#include "UI_resources.h"
#include "UI_interface.hh"
#include "UI_resources.hh"
#ifdef WITH_OPENVDB
# include <openvdb/openvdb.h>

6
source/blender/nodes/geometry/nodes/node_geo_input_grid_value.cc
View File

@ -15,8 +15,8 @@
#include "node_geometry_util.hh"
#include "UI_interface.h"
#include "UI_resources.h"
#include "UI_interface.hh"
#include "UI_resources.hh"
#ifdef WITH_OPENVDB
# include <openvdb/openvdb.h>
@ -57,7 +57,7 @@ static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
{
uiLayoutSetPropSep(layout, true);
uiLayoutSetPropDecorate(layout, false);
uiItemR(layout, ptr, "data_type", 0, "", ICON_NONE);
uiItemR(layout, ptr, "data_type", eUI_Item_Flag(0), "", ICON_NONE);
}
static void node_init(bNodeTree * /*tree*/, bNode *node)

6
source/blender/nodes/geometry/nodes/node_geo_set_grid_value.cc
View File

@ -18,8 +18,8 @@
#include "node_geometry_util.hh"
#include "UI_interface.h"
#include "UI_resources.h"
#include "UI_interface.hh"
#include "UI_resources.hh"
/* XXX bad include, don't care, just make it work. */
#include "intern/volume_grids.hh"
@ -68,7 +68,7 @@ static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
{
uiLayoutSetPropSep(layout, true);
uiLayoutSetPropDecorate(layout, false);
uiItemR(layout, ptr, "data_type", 0, "", ICON_NONE);
uiItemR(layout, ptr, "data_type", eUI_Item_Flag(0), "", ICON_NONE);
}
static void node_init(bNodeTree * /*tree*/, bNode *node)

6
source/blender/nodes/geometry/nodes/node_geo_volume_divergence.cc
View File

@ -5,7 +5,7 @@
#include "DEG_depsgraph_query.h"
#include "BKE_type_conversions.hh"
#include "BKE_volume.h"
#include "BKE_volume_openvdb.hh"
#include "BLI_virtual_array.hh"
@ -14,8 +14,8 @@
#include "node_geometry_util.hh"
#include "UI_interface.h"
#include "UI_resources.h"
#include "UI_interface.hh"
#include "UI_resources.hh"
#ifdef WITH_OPENVDB
# include <openvdb/openvdb.h>

6
source/blender/nodes/geometry/nodes/node_geo_volume_gradient.cc
View File

@ -5,7 +5,7 @@
#include "DEG_depsgraph_query.h"
#include "BKE_type_conversions.hh"
#include "BKE_volume.h"
#include "BKE_volume_openvdb.hh"
#include "BLI_virtual_array.hh"
@ -14,8 +14,8 @@
#include "node_geometry_util.hh"
#include "UI_interface.h"
#include "UI_resources.h"
#include "UI_interface.hh"
#include "UI_resources.hh"
#ifdef WITH_OPENVDB
# include <openvdb/openvdb.h>

6
source/blender/nodes/geometry/nodes/node_geo_volume_info.cc
View File

@ -5,7 +5,7 @@
#include "DEG_depsgraph_query.h"
#include "BKE_type_conversions.hh"
#include "BKE_volume.h"
#include "BKE_volume_openvdb.hh"
#include "BLI_virtual_array.hh"
@ -14,8 +14,8 @@
#include "node_geometry_util.hh"
#include "UI_interface.h"
#include "UI_resources.h"
#include "UI_interface.hh"
#include "UI_resources.hh"
#ifdef WITH_OPENVDB
# include <openvdb/openvdb.h>

5
source/blender/nodes/geometry/nodes/node_geo_volume_solve_poisson.cc
View File

@ -5,7 +5,6 @@
#include "DEG_depsgraph_query.h"
#include "BKE_type_conversions.hh"
#include "BKE_volume.h"
#include "BKE_volume_openvdb.hh"
#include "BLI_virtual_array.hh"
@ -15,8 +14,8 @@
#include "node_geometry_util.hh"
#include "UI_interface.h"
#include "UI_resources.h"
#include "UI_interface.hh"
#include "UI_resources.hh"
#ifdef WITH_OPENVDB
# include <openvdb/openvdb.h>