blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Initial Grease Pencil 3.0 stage #106848

Merged
Falk David merged 224 commits from filedescriptor/blender:grease-pencil-v3 into main 2023-05-30 11:14:22 +02:00
Conversation 8 Commits 224 Files Changed 94 +7 -5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit abc5711167 - Show all commits

12
source/blender/editors/gpencil/gpencil_ops.c
View File

@ -138,12 +138,14 @@ static bool gpencil_stroke_weightmode_poll_with_tool(bContext *C, const char gpe
/* Poll callback for stroke painting (draw brush) */ /* Poll callback for stroke painting (draw brush) */
static bool gpencil_stroke_paintmode_draw_poll(bContext *C) static bool gpencil_stroke_paintmode_draw_poll(bContext *C)
{ {
Object *object = CTX_data_active_object(C); if (U.experimental.use_grease_pencil_version3) {
if (object == NULL || object->type != OB_GREASE_PENCIL) { Object *object = CTX_data_active_object(C);
return false; if (object == NULL || object->type != OB_GREASE_PENCIL) {
return false;
}
return true;
} }
return true; return gpencil_stroke_paintmode_poll_with_tool(C, GPAINT_TOOL_DRAW);
// return gpencil_stroke_paintmode_poll_with_tool(C, GPAINT_TOOL_DRAW);
} }
/* Poll callback for stroke painting (erase brush) */ /* Poll callback for stroke painting (erase brush) */