[Bf-blender-cvs] [904e16f7460] greasepencil-object: More build fixes - Removing more lingering modifier/dof defines
Joshua Leung
noreply at git.blender.org
Tue May 8 17:56:21 CEST 2018
Commit: 904e16f7460605a54e32c715ac164bd42e1b1923
Author: Joshua Leung
Date: Tue May 8 17:55:04 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB904e16f7460605a54e32c715ac164bd42e1b1923
More build fixes - Removing more lingering modifier/dof defines
===================================================================
M source/blender/draw/engines/gpencil/gpencil_engine.c
M source/blender/draw/engines/gpencil/gpencil_engine.h
M source/blender/makesrna/RNA_access.h
M source/blender/makesrna/intern/rna_modifier.c
===================================================================
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 95ffbd6ae87..67a918e11dc 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -163,30 +163,6 @@ static void GPENCIL_create_shaders(void)
}
}
-static void GPENCIL_init_dof(void *vedata)
-{
- GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
-
- const DRWContextState *draw_ctx = DRW_context_state_get();
- View3D *v3d = draw_ctx->v3d;
- RegionView3D *rv3d = draw_ctx->rv3d;
- ViewLayer *view_layer = draw_ctx->view_layer;
- IDProperty *props = BKE_view_layer_engine_evaluated_get(view_layer, RE_engine_id_BLENDER_EEVEE);
-
- if ((DRW_state_is_opengl_render()) || (!DRW_state_is_image_render())) {
- /* viewport and opengl render */
- stl->storage->enable_dof = GP_IS_CAMERAVIEW && BKE_collection_engine_property_value_get_bool(props, "dof_enable");
- if (stl->storage->enable_dof == true) {
- Object *camera = (rv3d->persp == RV3D_CAMOB) ? v3d->camera : NULL;
- GPENCIL_depth_of_field_init(&draw_engine_gpencil_type, &e_data, vedata, camera);
- }
- }
- else {
- /* render F12 */
- stl->storage->enable_dof = BKE_collection_engine_property_value_get_bool(props, "dof_enable");
- }
-}
-
static void GPENCIL_engine_init(void *vedata)
{
GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
@@ -209,9 +185,6 @@ static void GPENCIL_engine_init(void *vedata)
if (!e_data.gpencil_blank_texture) {
e_data.gpencil_blank_texture = DRW_gpencil_create_blank_texture(16, 16);
}
-
- /* init depth of field */
- GPENCIL_init_dof(vedata);
}
static void GPENCIL_engine_free(void)
@@ -226,10 +199,6 @@ static void GPENCIL_engine_free(void)
DRW_SHADER_FREE_SAFE(e_data.gpencil_painting_sh);
DRW_SHADER_FREE_SAFE(e_data.gpencil_paper_sh);
- DRW_SHADER_FREE_SAFE(e_data.gpencil_dof_downsample_sh);
- DRW_SHADER_FREE_SAFE(e_data.gpencil_dof_scatter_sh);
- DRW_SHADER_FREE_SAFE(e_data.gpencil_dof_resolve_sh);
-
DRW_TEXTURE_FREE_SAFE(e_data.gpencil_blank_texture);
}
@@ -426,9 +395,6 @@ static void GPENCIL_cache_init(void *vedata)
}
DRW_shgroup_uniform_int(paper_shgrp, "uselines", &stl->storage->uselines, 1);
}
-
- /* depth of field */
- GPENCIL_depth_of_field_cache_init(&e_data, vedata);
}
}
@@ -962,12 +928,6 @@ static void GPENCIL_render_to_image(void *vedata, RenderEngine *engine, struct R
GPENCIL_engine_init(vedata);
GPENCIL_render_init(vedata, engine, draw_ctx->depsgraph);
- /* depth of field */
- Object *camera = DEG_get_evaluated_object(draw_ctx->depsgraph, RE_GetCamera(engine->re));
- GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
- stl->storage->camera = camera; /* save current camera */
- GPENCIL_depth_of_field_init(&draw_engine_gpencil_type, &e_data, vedata, camera);
-
GPENCIL_FramebufferList *fbl = ((GPENCIL_Data *)vedata)->fbl;
if (fbl->main) {
GPU_framebuffer_texture_attach(fbl->main, e_data.render_depth_tx, 0, 0);
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h
index d977bf590f9..64759af1965 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.h
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.h
@@ -298,10 +298,4 @@ struct GpencilBatchCache *gpencil_batch_cache_get(struct Object *ob, int cfra);
/* modifier functions */
void gpencil_instance_modifiers(struct GPENCIL_StorageList *stl, struct Object *ob);
-/* depth of field */
-int GPENCIL_depth_of_field_init(struct DrawEngineType *draw_engine_gpencil_type, struct GPENCIL_e_data *e_data, struct GPENCIL_Data *vedata, struct Object *camera);
-void GPENCIL_depth_of_field_cache_init(struct GPENCIL_e_data *e_data, struct GPENCIL_Data *vedata);
-void GPENCIL_depth_of_field_draw(struct GPENCIL_e_data *e_data, struct GPENCIL_Data *vedata);
-void GPENCIL_dof_nearfar(struct Object *camera, float coc, float nearfar[2]);
-
#endif /* __GPENCIL_ENGINE_H__ */
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index f43e07a8706..0688b3d8067 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -604,12 +604,6 @@ extern StructRNA RNA_GpencilInstanceModifier;
extern StructRNA RNA_GpencilDupliModifier;
extern StructRNA RNA_GpencilOpacityModifier;
extern StructRNA RNA_GpencilLatticeModifier;
-extern StructRNA RNA_GpencilBlurModifier;
-extern StructRNA RNA_GpencilWaveModifier;
-extern StructRNA RNA_GpencilPixelModifier;
-extern StructRNA RNA_GpencilSwirlModifier;
-extern StructRNA RNA_GpencilFlipModifier;
-extern StructRNA RNA_GpencilLightModifier;
extern StructRNA RNA_GpencilSmoothModifier;
extern StructRNA RNA_GpencilHookModifier;
extern StructRNA RNA_GpencilOffsetModifier;
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 2efeb870bfb..b21a101823c 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -475,18 +475,6 @@ static StructRNA *rna_Modifier_refine(struct PointerRNA *ptr)
return &RNA_GpencilOpacityModifier;
case eModifierType_GpencilLattice:
return &RNA_GpencilLatticeModifier;
- case eModifierType_GpencilBlur:
- return &RNA_GpencilBlurModifier;
- case eModifierType_GpencilWave:
- return &RNA_GpencilWaveModifier;
- case eModifierType_GpencilPixel:
- return &RNA_GpencilPixelModifier;
- case eModifierType_GpencilSwirl:
- return &RNA_GpencilSwirlModifier;
- case eModifierType_GpencilFlip:
- return &RNA_GpencilFlipModifier;
- case eModifierType_GpencilLight:
- return &RNA_GpencilLightModifier;
case eModifierType_GpencilSmooth:
return &RNA_GpencilSmoothModifier;
case eModifierType_GpencilHook:
More information about the Bf-blender-cvs
mailing list