nrupsis/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

me-main #1

Merged
Nate Rupsis merged 123 commits from me-main into main 2023-02-13 18:39:11 +01:00
Conversation 0 Commits 123 Files Changed 969 +4 -4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 50918d44fb - Show all commits

4
source/blender/editors/include/ED_object.h
View File

@ -241,8 +241,8 @@ void ED_object_parent(struct Object *ob, struct Object *parent, int type, const
char *ED_object_ot_drop_named_material_tooltip(struct bContext *C, char *ED_object_ot_drop_named_material_tooltip(struct bContext *C,
const char *name, const char *name,
const int mval[2]); const int mval[2]);
char *ED_object_ot_drop_geometry_nodes_tooltip(const struct bContext *C, char *ED_object_ot_drop_geometry_nodes_tooltip(struct bContext *C,
const struct PointerRNA *properties, struct PointerRNA *properties,
const int mval[2]); const int mval[2]);
/* bitflags for enter/exit editmode */ /* bitflags for enter/exit editmode */

4
source/blender/editors/object/object_relations.c
View File

@ -2873,8 +2873,8 @@ void OBJECT_OT_drop_named_material(wmOperatorType *ot)
/** \name Drop Geometry Nodes on Object Operator /** \name Drop Geometry Nodes on Object Operator
* \{ */ * \{ */
char *ED_object_ot_drop_geometry_nodes_tooltip(const bContext *C, char *ED_object_ot_drop_geometry_nodes_tooltip(bContext *C,
const PointerRNA *properties, PointerRNA *properties,
const int mval[2]) const int mval[2])
{ {
const Object *ob = ED_view3d_give_object_under_cursor(C, mval); const Object *ob = ED_view3d_give_object_under_cursor(C, mval);