Chris_Blackbourn/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests 1 Activity

WIP: uv-simple-select #1

Closed
Chris Blackbourn wants to merge 182 commits from uv-simple-select into main
pull from: uv-simple-select
merge into: Chris_Blackbourn:main

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

1
release/datafiles/userdef/userdef_default_theme.c
View File

@ -370,6 +370,7 @@ const bTheme U_theme_default = {
.clipping_border_3d = RGBA(0x3f3f3fff), .clipping_border_3d = RGBA(0x3f3f3fff),
.bundle_solid = RGBA(0xc8c8c8ff), .bundle_solid = RGBA(0xc8c8c8ff),
.camera_path = RGBA(0x000000ff), .camera_path = RGBA(0x000000ff),
.camera_passepartout = RGBA(0x000000),
.gp_vertex_size = 3, .gp_vertex_size = 3,
.gp_vertex = RGBA(0x000000ff), .gp_vertex = RGBA(0x000000ff),
.gp_vertex_select = RGBA(0xff8500ff), .gp_vertex_select = RGBA(0xff8500ff),

1
source/blender/editors/include/UI_resources.h
View File

@ -236,6 +236,7 @@ typedef enum ThemeColorID {
TH_PATH_KEYFRAME_BEFORE, TH_PATH_KEYFRAME_BEFORE,
TH_PATH_KEYFRAME_AFTER, TH_PATH_KEYFRAME_AFTER,
TH_CAMERA_PATH, TH_CAMERA_PATH,
TH_CAMERA_PASSEPARTOUT,
TH_LOCK_MARKER, TH_LOCK_MARKER,
TH_STITCH_PREVIEW_FACE, TH_STITCH_PREVIEW_FACE,

3
source/blender/editors/interface/resources.cc
View File

@ -803,6 +803,9 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid)
case TH_CAMERA_PATH: case TH_CAMERA_PATH:
cp = ts->camera_path; cp = ts->camera_path;
break; break;
case TH_CAMERA_PASSEPARTOUT:
cp = ts->camera_passepartout;
break;
case TH_LOCK_MARKER: case TH_LOCK_MARKER:
cp = ts->lock_marker; cp = ts->lock_marker;
break; break;

2
source/blender/editors/space_view3d/view3d_draw.cc
View File

@ -585,7 +585,7 @@ static void drawviewborder(Scene *scene, Depsgraph *depsgraph, ARegion *region,
alpha = ca->passepartalpha; alpha = ca->passepartalpha;
} }
immUniformColor4f(0.0f, 0.0f, 0.0f, alpha); immUniformThemeColorAlpha(TH_CAMERA_PASSEPARTOUT, alpha);
if (x1i > 0.0f) { if (x1i > 0.0f) {
immRectf(shdr_pos, 0.0f, winy, x1i, 0.0f); immRectf(shdr_pos, 0.0f, winy, x1i, 0.0f);

3
source/blender/makesdna/DNA_userdef_types.h
View File

@ -354,7 +354,8 @@ typedef struct ThemeSpace {
unsigned char path_before[4], path_after[4]; unsigned char path_before[4], path_after[4];
unsigned char path_keyframe_before[4], path_keyframe_after[4]; unsigned char path_keyframe_before[4], path_keyframe_after[4];
unsigned char camera_path[4]; unsigned char camera_path[4];
unsigned char _pad1[6]; unsigned char camera_passepartout[4];
unsigned char _pad1[2];
unsigned char gp_vertex_size; unsigned char gp_vertex_size;
unsigned char gp_vertex[4], gp_vertex_select[4]; unsigned char gp_vertex[4], gp_vertex_select[4];

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

@ -2345,6 +2345,11 @@ static void rna_def_userdef_theme_space_view3d(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Camera Path", ""); RNA_def_property_ui_text(prop, "Camera Path", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
prop = RNA_def_property(srna, "camera_passepartout", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_array(prop, 3);
RNA_def_property_ui_text(prop, "Camera Passepartout", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
prop = RNA_def_property(srna, "skin_root", PROP_FLOAT, PROP_COLOR_GAMMA); prop = RNA_def_property(srna, "skin_root", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_array(prop, 3); RNA_def_property_array(prop, 3);
RNA_def_property_ui_text(prop, "Skin Root", ""); RNA_def_property_ui_text(prop, "Skin Root", "");