blender/blender
165
520
Fork 795
Code Issues 6.8k Pull Requests 962 Projects 21 Wiki Activity

WIP: Geometry Nodes: A Modeling Approach of Gizmo #108744

Closed
Iliya Katushenock wants to merge 29 commits from mod_moder:gizmos_bke_component into main
pull from: mod_moder:gizmos_bke_component
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 29 Files Changed 22 +2 -17
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6a92f47121 - Show all commits

5
source/blender/blenkernel/BKE_node.h
View File

@ -1361,14 +1361,11 @@ void BKE_nodetree_remove_layer_n(struct bNodeTree *ntree, struct Scene *scene, i
#define GEO_NODE_INPUT_SIGNED_DISTANCE 2102
#define GEO_NODE_SAMPLE_VOLUME 2103
#define GEO_NODE_MESH_TOPOLOGY_CORNERS_OF_EDGE 2104
<<<<<<< HEAD
#define GEO_NODE_ARROW_GIZMO 2105
=======
/* Leaving out two indices to avoid crashes with files that were created during the development of
* the repeat zone. */
#define GEO_NODE_REPEAT_INPUT 2107
#define GEO_NODE_REPEAT_OUTPUT 2108
>>>>>>> main
#define GEO_NODE_ARROW_GIZMO 2109
/** \} */

14
source/blender/editors/space_view3d/CMakeLists.txt
View File

@ -32,18 +32,6 @@ set(SRC
view3d_camera_control.cc
view3d_cursor_snap.cc
view3d_draw.cc
<<<<<<< HEAD
view3d_edit.c
view3d_gizmo_armature.c
view3d_gizmo_camera.c
view3d_gizmo_empty.c
view3d_gizmo_forcefield.c
view3d_gizmo_geometry_node_gizmos.cc
view3d_gizmo_light.c
view3d_gizmo_navigate.c
view3d_gizmo_navigate_type.c
view3d_gizmo_preselect.c
=======
view3d_edit.cc
view3d_gizmo_armature.cc
view3d_gizmo_camera.cc
@ -53,7 +41,7 @@ set(SRC
view3d_gizmo_navigate.cc
view3d_gizmo_navigate_type.cc
view3d_gizmo_preselect.cc
>>>>>>> main
view3d_gizmo_geometry_node_gizmos.cc
view3d_gizmo_preselect_type.cc
view3d_gizmo_ruler.cc
view3d_gizmo_tool_generic.cc