blender
/
blender
135
420
Fork 603
Code Issues 6.3k Pull Requests 754 Projects 19 Wiki Activity

blender-v3.6-release backports #111957

Merged
Philipp Oeser merged 10 commits from lichtwerk/blender:blender-v3.6-release into blender-v3.6-release 2023-09-05 12:27:20 +02:00
Conversation 3 Commits 10 Files Changed 12 +4 -1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4cf03b28b3 - Show all commits

5
source/blender/makesrna/intern/rna_space.c
View File

@ -1604,8 +1604,11 @@ static int rna_SpaceView3D_icon_from_show_object_viewport_get(PointerRNA *ptr)
&v3d->object_type_exclude_select);
}
static char *rna_View3DShading_path(const PointerRNA *UNUSED(ptr))
static char *rna_View3DShading_path(const PointerRNA *ptr)
{
if (GS(ptr->owner_id->name) == ID_SCE) {
return BLI_strdup("display.shading");
}
return BLI_strdup("shading");
}