[Bf-blender-cvs] [6dc50bc25ae] blender2.8: Cleanup: warnings
Campbell Barton
noreply at git.blender.org
Fri Apr 20 20:49:13 CEST 2018
Commit: 6dc50bc25ae96039b9c2a4eba82ea9dad2b42c84
Author: Campbell Barton
Date: Fri Apr 20 20:48:19 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB6dc50bc25ae96039b9c2a4eba82ea9dad2b42c84
Cleanup: warnings
===================================================================
M source/blender/draw/engines/eevee/eevee_temporal_sampling.c
M source/blender/editors/animation/anim_markers.c
===================================================================
diff --git a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
index 06f6293240d..98a4371eb4c 100644
--- a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
+++ b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
@@ -175,8 +175,8 @@ void EEVEE_temporal_sampling_matrices_calc(
int EEVEE_temporal_sampling_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata)
{
EEVEE_StorageList *stl = vedata->stl;
- EEVEE_FramebufferList *fbl = vedata->fbl;
- EEVEE_TextureList *txl = vedata->txl;
+ // EEVEE_FramebufferList *fbl = vedata->fbl;
+ // EEVEE_TextureList *txl = vedata->txl;
EEVEE_EffectsInfo *effects = stl->effects;
if (!e_data.taa_resolve_sh) {
@@ -295,7 +295,7 @@ void EEVEE_temporal_sampling_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data
DRW_shgroup_uniform_texture_ref(grp, "colorBuffer", &txl->color);
if (effects->enabled_effects & EFFECT_TAA_REPROJECT) {
- DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
+ // DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
DRW_shgroup_uniform_texture_ref(grp, "velocityBuffer", &effects->velocity_tx);
DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
}
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index 96da87cd8cc..b31c1aa0b4d 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -570,11 +570,10 @@ static int ed_markers_poll_markers_exist(bContext *C)
static int ed_markers_opwrap_invoke_custom(bContext *C, wmOperator *op, const wmEvent *event,
int (*invoke_func)(bContext *, wmOperator *, const wmEvent *))
{
- ScrArea *sa = CTX_wm_area(C);
int retval = OPERATOR_PASS_THROUGH;
-
+
/* removed check for Y coord of event, keymap has bounbox now */
-
+
/* allow operator to run now */
if (invoke_func)
retval = invoke_func(C, op, event);
@@ -582,13 +581,13 @@ static int ed_markers_opwrap_invoke_custom(bContext *C, wmOperator *op, const wm
retval = op->type->exec(C, op);
else
BKE_report(op->reports, RPT_ERROR, "Programming error: operator does not actually have code to do anything!");
-
-
+
+
/* unless successful, must add "pass-through" to let normal operator's have a chance at tackling this event */
if ((retval & (OPERATOR_FINISHED | OPERATOR_INTERFACE)) == 0) {
retval |= OPERATOR_PASS_THROUGH;
}
-
+
return retval;
}
More information about the Bf-blender-cvs
mailing list