diff options
| author | Julian Eisel <julian@blender.org> | 2022-05-24 16:23:13 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2022-05-24 16:23:13 +0300 |
| commit | 961db61fb87fb5400bc0080e6a4d2e3fc16c1761 (patch) | |
| tree | 0b4a5972d3998771a1ae5c8c563b5973c6bcb62a /source/blender/editors/include | |
| parent | 258f6cbf93678b7bfbd997a06ab0ec67571174b5 (diff) | |
| parent | bc3dbf109c67fe2bced477774abdef7a53d66081 (diff) | |
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'source/blender/editors/include')
| -rw-r--r-- | source/blender/editors/include/ED_object.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index 28452ba8db9..0078c1087a0 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -234,7 +234,7 @@ struct Base *ED_object_add_duplicate(struct Main *bmain, void ED_object_parent(struct Object *ob, struct Object *parent, int type, const char *substr); char *ED_object_ot_drop_named_material_tooltip(struct bContext *C, - struct PointerRNA *properties, + const char *name, const int mval[2]); /* bitflags for enter/exit editmode */ |