blender/blender
148
473
Fork 695
Code Issues 6.7k Pull Requests 901 Projects 18 Wiki Activity

GPencil: Add "Brush" option to Grease Pencil Eyedropper modes #106576

Open
casey-bianco-davis wants to merge 4 commits from casey-bianco-davis/blender:temp-gpencil-improvements into main
pull from: casey-bianco-davis/blender:temp-gpencil-improvements
merge into: blender:main

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

5
source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc
View File

@ -53,6 +53,7 @@
enum eGP_EyeMode {
GP_EYE_MATERIAL = 0,
GP_EYE_PALETTE = 1,
GP_EYE_BRUSH = 2,
};
struct EyedropperGPencil {
@ -234,10 +235,10 @@ static void eyedropper_set_brush_color(bContext *C, const float col_conv[4])
Paint *paint = nullptr;
switch (mode) {
case CTX_MODE_PAINT_GPENCIL:
case CTX_MODE_PAINT_GPENCIL_LEGACY:
paint = &ts->gp_paint->paint;
break;
case CTX_MODE_VERTEX_GPENCIL:
case CTX_MODE_VERTEX_GPENCIL_LEGACY:
paint = &ts->gp_vertexpaint->paint;
break;
default: