diff options
Diffstat (limited to 'source/blender/draw/engines')
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_lightcache.h | 2 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_private.h | 8 | ||||
-rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_engine.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.h b/source/blender/draw/engines/eevee/eevee_lightcache.h index 834f0fc8a45..489c9ac22f4 100644 --- a/source/blender/draw/engines/eevee/eevee_lightcache.h +++ b/source/blender/draw/engines/eevee/eevee_lightcache.h @@ -40,7 +40,7 @@ struct wmJob *EEVEE_lightbake_job_create(struct wmWindowManager *wm, int delay, int frame); void *EEVEE_lightbake_job_data_alloc(struct Main *bmain, - struct ViewLayer *viewlayer, + struct ViewLayer *view_layer, struct Scene *scene, bool run_as_job, int frame); diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h index bf346708b34..4aaf6741a1c 100644 --- a/source/blender/draw/engines/eevee/eevee_private.h +++ b/source/blender/draw/engines/eevee/eevee_private.h @@ -973,7 +973,7 @@ typedef struct EEVEE_PrivateData { /* eevee_data.c */ void EEVEE_motion_blur_data_init(EEVEE_MotionBlurData *mb); void EEVEE_motion_blur_data_free(EEVEE_MotionBlurData *mb); -void EEVEE_view_layer_data_free(void *sldata); +void EEVEE_view_layer_data_free(void *storage); EEVEE_ViewLayerData *EEVEE_view_layer_data_get(void); EEVEE_ViewLayerData *EEVEE_view_layer_data_ensure_ex(struct ViewLayer *view_layer); EEVEE_ViewLayerData *EEVEE_view_layer_data_ensure(void); @@ -1152,8 +1152,8 @@ void EEVEE_lightbake_filter_visibility(EEVEE_ViewLayerData *sldata, float vis_blur, int vis_size); -void EEVEE_lightprobes_grid_data_from_object(Object *ob, EEVEE_LightGrid *prb_data, int *offset); -void EEVEE_lightprobes_cube_data_from_object(Object *ob, EEVEE_LightProbe *prb_data); +void EEVEE_lightprobes_grid_data_from_object(Object *ob, EEVEE_LightGrid *egrid, int *offset); +void EEVEE_lightprobes_cube_data_from_object(Object *ob, EEVEE_LightProbe *eprobe); void EEVEE_lightprobes_planar_data_from_object(Object *ob, EEVEE_PlanarReflection *eplanar, EEVEE_LightProbeVisTest *vis_test); @@ -1309,7 +1309,7 @@ void EEVEE_render_cache(void *vedata, struct Depsgraph *depsgraph); void EEVEE_render_draw(EEVEE_Data *vedata, struct RenderEngine *engine, - struct RenderLayer *render_layer, + struct RenderLayer *rl, const struct rcti *rect); void EEVEE_render_read_result(EEVEE_Data *vedata, struct RenderEngine *engine, diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h index 852945b25c3..7a516b3dd6b 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.h +++ b/source/blender/draw/engines/gpencil/gpencil_engine.h @@ -393,7 +393,7 @@ void gpencil_material_resources_get(GPENCIL_MaterialPool *first_pool, struct GPUUniformBuf **r_ubo_mat); void gpencil_light_ambient_add(GPENCIL_LightPool *lightpool, const float color[3]); -void gpencil_light_pool_populate(GPENCIL_LightPool *matpool, Object *ob); +void gpencil_light_pool_populate(GPENCIL_LightPool *lightpool, Object *ob); GPENCIL_LightPool *gpencil_light_pool_add(GPENCIL_PrivateData *pd); GPENCIL_LightPool *gpencil_light_pool_create(GPENCIL_PrivateData *pd, Object *ob); |