Merge branch 'blender-v2.91-release'

This commit is contained in:
Campbell Barton 2020-10-22 12:03:41 +11:00
commit cee35b2ca5
1 changed files with 6 additions and 0 deletions

View File

@ -61,6 +61,8 @@
# include "MEM_guardedalloc.h"
# include "GPU_state.h"
# ifdef WITH_PYTHON
# include "BPY_extern.h"
# endif
@ -84,6 +86,8 @@ static void rna_gizmo_draw_cb(const struct bContext *C, struct wmGizmo *gz)
RNA_parameter_set_lookup(&list, "context", &C);
gzgroup->type->rna_ext.call((bContext *)C, &gz_ptr, func, &list);
RNA_parameter_list_free(&list);
/* This callback may have called bgl functions. */
GPU_bgl_end();
}
static void rna_gizmo_draw_select_cb(const struct bContext *C, struct wmGizmo *gz, int select_id)
@ -101,6 +105,8 @@ static void rna_gizmo_draw_select_cb(const struct bContext *C, struct wmGizmo *g
RNA_parameter_set_lookup(&list, "select_id", &select_id);
gzgroup->type->rna_ext.call((bContext *)C, &gz_ptr, func, &list);
RNA_parameter_list_free(&list);
/* This callback may have called bgl functions. */
GPU_bgl_end();
}
static int rna_gizmo_test_select_cb(struct bContext *C, struct wmGizmo *gz, const int location[2])