blender
/
blender
136
411
Fork 595
Code Issues 6.3k Pull Requests 774 Projects 19 Wiki Activity

Fix: GPv3 layer renaming when name is unchanged #111173

Merged
Pratik Borhade merged 3 commits from PratikPB2123/blender:gpv3-rename-outliner into main 2023-08-16 14:48:54 +02:00
Conversation 1 Commits 3 Files Changed 1 +3 -1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/space_outliner/outliner_draw.cc
View File

@ -864,8 +864,10 @@ static void namebutton_fn(bContext *C, void *tsep, char *oldname)
/* The node already has the new name set. To properly rename the node, we need to first
* store the new name, restore the old name in the node, and then call the rename
* function. */
Falk David commented 2023-08-16 11:50:50 +02:00
Outdated
Review
Copy Link

If the issue is that the node.name points to oldname shouldn't this compare the pointers instead of the string?

If the issue is that the `node.name` points to `oldname` shouldn't this compare the pointers instead of the string?
Pratik Borhade commented 2023-08-16 12:03:53 +02:00
Outdated
Review
Copy Link

node.name points to oldname after this if block (see line 871 in PR 😅 )

`node.name` points to oldname after this `if block` (see line 871 in PR 😅 )
Falk David commented 2023-08-16 12:09:08 +02:00
Outdated
Review
Copy Link

Ah, of course. Then I think the right thing to do is call STRNCPY(node.name, oldname); instead of node.name = oldname;

Ah, of course. Then I think the right thing to do is call `STRNCPY(node.name, oldname);` instead of `node.name = oldname;`
std::string new_name(node.name);
node.name = oldname;
node.name = BLI_strdup(oldname);
Falk David commented 2023-08-16 13:09:43 +02:00
Outdated
Review
Copy Link

sizeof(oldname) is a pointer, this won't work. But you can use node.name = BLI_strdup(oldname) which will call strlen internally.

`sizeof(oldname)` is a pointer, this won't work. But you can use `node.name = BLI_strdup(oldname)` which will call `strlen` internally.
if (node.is_group()) {
grease_pencil.rename_group(node.as_group_for_write(), new_name);
}