Initial Grease Pencil 3.0 stage #106848
|
@ -1315,6 +1315,12 @@ static void drw_engines_data_validate(void)
|
||||||
* For slow exact check use `DRW_render_check_grease_pencil` */
|
* For slow exact check use `DRW_render_check_grease_pencil` */
|
||||||
static bool drw_gpencil_engine_needed(Depsgraph *depsgraph, View3D *v3d)
|
static bool drw_gpencil_engine_needed(Depsgraph *depsgraph, View3D *v3d)
|
||||||
{
|
{
|
||||||
|
if (U.experimental.use_grease_pencil_version3) {
|
||||||
|
const bool exclude_gpencil_rendering = v3d ? (v3d->object_type_exclude_viewport &
|
||||||
|
(1 << OB_GREASE_PENCIL)) != 0 :
|
||||||
|
false;
|
||||||
|
return (!exclude_gpencil_rendering) && DEG_id_type_any_exists(depsgraph, ID_GP);
|
||||||
|
}
|
||||||
const bool exclude_gpencil_rendering = v3d ? (v3d->object_type_exclude_viewport &
|
const bool exclude_gpencil_rendering = v3d ? (v3d->object_type_exclude_viewport &
|
||||||
(1 << OB_GPENCIL_LEGACY)) != 0 :
|
(1 << OB_GPENCIL_LEGACY)) != 0 :
|
||||||
false;
|
false;
|
||||||
|
@ -1878,7 +1884,8 @@ bool DRW_render_check_grease_pencil(Depsgraph *depsgraph)
|
||||||
deg_iter_settings.depsgraph = depsgraph;
|
deg_iter_settings.depsgraph = depsgraph;
|
||||||
deg_iter_settings.flags = DEG_OBJECT_ITER_FOR_RENDER_ENGINE_FLAGS;
|
deg_iter_settings.flags = DEG_OBJECT_ITER_FOR_RENDER_ENGINE_FLAGS;
|
||||||
DEG_OBJECT_ITER_BEGIN (°_iter_settings, ob) {
|
DEG_OBJECT_ITER_BEGIN (°_iter_settings, ob) {
|
||||||
if (ob->type == OB_GPENCIL_LEGACY) {
|
if (ob->type == OB_GPENCIL_LEGACY ||
|
||||||
|
(U.experimental.use_grease_pencil_version3 && ob->type == OB_GREASE_PENCIL)) {
|
||||||
if (DRW_object_visibility_in_active_context(ob) & OB_VISIBLE_SELF) {
|
if (DRW_object_visibility_in_active_context(ob) & OB_VISIBLE_SELF) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue