blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Fix T96608: GPencil Simplify must check general Simplify switch 

As the grease pencil simplify is a subotion of general simplify, if the general switch is disabled, the grease pencil simplify must be disabled too.

This patch also disable the UI panel.
This commit is contained in:
Antonio Vazquez 2022-03-18 19:50:38 +01:00
parent 298d8a7b4a
commit 63f9cb5a0b
Notes: blender-bot 2023-02-14 02:58:19 +01:00 
Referenced by issue #96608, GPencil: General simplify switch must be enabled to simplify gpencil
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/properties_grease_pencil_common.py
View File

@ -677,7 +677,7 @@ class GreasePencilSimplifyPanel:
rd = context.scene.render
layout.active = rd.simplify_gpencil
layout.active = rd.use_simplify and rd.simplify_gpencil
col = layout.column()
col.prop(rd, "simplify_gpencil_onplay")

3
source/blender/blenkernel/BKE_gpencil.h
View File

@ -34,7 +34,8 @@ struct bGPDlayer_Mask;
struct bGPDstroke;
struct bGPdata;
#define GPENCIL_SIMPLIFY(scene) (scene->r.simplify_gpencil & SIMPLIFY_GPENCIL_ENABLE)
#define GPENCIL_SIMPLIFY(scene) \
((scene->r.mode & R_SIMPLIFY) && (scene->r.simplify_gpencil & SIMPLIFY_GPENCIL_ENABLE))
#define GPENCIL_SIMPLIFY_ONPLAY(playing) \
(((playing == true) && (scene->r.simplify_gpencil & SIMPLIFY_GPENCIL_ON_PLAY)) || \
((scene->r.simplify_gpencil & SIMPLIFY_GPENCIL_ON_PLAY) == 0))