[Bf-blender-cvs] [a954837eae5] greasepencil-object: Replace constant bokeh value by parameter
Antonio Vazquez
noreply at git.blender.org
Thu Mar 29 19:38:52 CEST 2018
Commit: a954837eae5162ee8b3e6573c65c694e063e39ce
Author: Antonio Vazquez
Date: Thu Mar 29 19:38:43 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBa954837eae5162ee8b3e6573c65c694e063e39ce
Replace constant bokeh value by parameter
===================================================================
M source/blender/draw/engines/gpencil/gpencil_depth_of_field.c
===================================================================
diff --git a/source/blender/draw/engines/gpencil/gpencil_depth_of_field.c b/source/blender/draw/engines/gpencil/gpencil_depth_of_field.c
index c45bd3c00f6..c0c8f96d011 100644
--- a/source/blender/draw/engines/gpencil/gpencil_depth_of_field.c
+++ b/source/blender/draw/engines/gpencil/gpencil_depth_of_field.c
@@ -63,6 +63,8 @@ int GPENCIL_depth_of_field_init(DrawEngineType *draw_engine_gpencil_type, GPENCI
GPENCIL_FramebufferList *fbl = ((GPENCIL_Data *)vedata)->fbl;
const DRWContextState *draw_ctx = DRW_context_state_get();
+ ViewLayer *view_layer = draw_ctx->view_layer;
+ IDProperty *props = BKE_view_layer_engine_evaluated_get(view_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE);
Scene *scene = draw_ctx->scene;
RegionView3D *rv3d = draw_ctx->rv3d;
@@ -150,7 +152,7 @@ int GPENCIL_depth_of_field_init(DrawEngineType *draw_engine_gpencil_type, GPENCI
stl->storage->dof_bokeh[0] = blades;
stl->storage->dof_bokeh[1] = rotation;
stl->storage->dof_bokeh[2] = ratio;
- stl->storage->dof_bokeh[3] = 100.0f; /* TODO: Review this value */
+ stl->storage->dof_bokeh[3] = BKE_collection_engine_property_value_get_float(props, "bokeh_max_size");
return 1;
}
More information about the Bf-blender-cvs
mailing list