diff --git a/scripts/startup/bl_ui/properties_render.py b/scripts/startup/bl_ui/properties_render.py index 8cf3460cf31..86e6b31678e 100644 --- a/scripts/startup/bl_ui/properties_render.py +++ b/scripts/startup/bl_ui/properties_render.py @@ -481,6 +481,7 @@ class RENDER_PT_eevee_next_volumetric_lighting(RenderButtonsPanel, Panel): layout.active = props.use_volumetric_lights layout.prop(props, "volumetric_light_clamp", text="Light Clamping") + class RENDER_PT_eevee_next_volumetric_shadows(RenderButtonsPanel, Panel): bl_label = "Volumetric Shadows" bl_parent_id = "RENDER_PT_eevee_next_volumetric" diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.cc b/source/blender/draw/intern/draw_cache_impl_mesh.cc index ddc7b799227..214228d9015 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.cc +++ b/source/blender/draw/intern/draw_cache_impl_mesh.cc @@ -1301,7 +1301,7 @@ static void drw_add_attributes_vbo(GPUBatch *batch, #ifdef DEBUG /* Sanity check function to test if all requested batches are available. */ -static void drw_mesh_batch_cache_check_available(struct TaskGraph *task_graph, Mesh *me) +static void drw_mesh_batch_cache_check_available(TaskGraph *task_graph, Mesh *me) { MeshBatchCache *cache = mesh_batch_cache_get(me); /* Make sure all requested batches have been setup. */ diff --git a/source/blender/editors/space_file/fsmenu_system.cc b/source/blender/editors/space_file/fsmenu_system.cc index e9b8417ad34..d7f7dc6ae52 100644 --- a/source/blender/editors/space_file/fsmenu_system.cc +++ b/source/blender/editors/space_file/fsmenu_system.cc @@ -162,7 +162,7 @@ static void fsmenu_xdg_insert_entry(GHash *xdg_map, #ifdef WIN32 /* Add Windows Quick Access items to the System list. */ -static void fsmenu_add_windows_quick_access(struct FSMenu *fsmenu, +static void fsmenu_add_windows_quick_access(FSMenu *fsmenu, FSMenuCategory category, FSMenuInsert flag) { diff --git a/source/blender/editors/space_sequencer/sequencer_intern.hh b/source/blender/editors/space_sequencer/sequencer_intern.hh index feb916cef57..f024394bd6f 100644 --- a/source/blender/editors/space_sequencer/sequencer_intern.hh +++ b/source/blender/editors/space_sequencer/sequencer_intern.hh @@ -27,7 +27,9 @@ struct StripElem; struct View2D; struct bContext; struct rctf; +struct wmKeyConfig; struct wmOperator; +struct wmOperatorType; struct ScrArea; struct Editing; struct ListBase; @@ -35,40 +37,40 @@ struct ListBase; #define DEFAULT_IMG_STRIP_LENGTH 25 /* XXX arbitrary but ok for now. */ #define OVERLAP_ALPHA 180 -typedef struct SeqChannelDrawContext { - const struct bContext *C; - struct ScrArea *area; - struct ARegion *region; - struct ARegion *timeline_region; - struct View2D *v2d; - struct View2D *timeline_region_v2d; +struct SeqChannelDrawContext { + const bContext *C; + ScrArea *area; + ARegion *region; + ARegion *timeline_region; + View2D *v2d; + View2D *timeline_region_v2d; - struct Scene *scene; - struct Editing *ed; - struct ListBase *seqbase; /* Displayed seqbase. */ - struct ListBase *channels; /* Displayed channels. */ + Scene *scene; + Editing *ed; + ListBase *seqbase; /* Displayed seqbase. */ + ListBase *channels; /* Displayed channels. */ float draw_offset; float channel_height; float frame_width; float scale; -} SeqChannelDrawContext; +}; /* `sequencer_timeline_draw.cc` */ -void draw_timeline_seq(const struct bContext *C, struct ARegion *region); -void draw_timeline_seq_display(const struct bContext *C, struct ARegion *region); -void color3ubv_from_seq(const struct Scene *curscene, - const struct Sequence *seq, +void draw_timeline_seq(const bContext *C, ARegion *region); +void draw_timeline_seq_display(const bContext *C, ARegion *region); +void color3ubv_from_seq(const Scene *curscene, + const Sequence *seq, bool show_strip_color_tag, uchar r_col[3]); /* `sequencer_preview_draw.cc` */ -void sequencer_draw_preview(const struct bContext *C, - struct Scene *scene, - struct ARegion *region, - struct SpaceSeq *sseq, +void sequencer_draw_preview(const bContext *C, + Scene *scene, + ARegion *region, + SpaceSeq *sseq, int timeline_frame, int offset, bool draw_overlay, @@ -78,12 +80,10 @@ int sequencer_draw_get_transform_preview_frame(Scene *scene); void sequencer_special_update_set(Sequence *seq); /* Get handle width in 2d-View space. */ -float sequence_handle_size_get_clamped(const struct Scene *scene, - struct Sequence *seq, - float pixelx); +float sequence_handle_size_get_clamped(const Scene *scene, Sequence *seq, float pixelx); /* UNUSED */ -/* void seq_reset_imageofs(struct SpaceSeq *sseq); */ +/* void seq_reset_imageofs(SpaceSeq *sseq); */ /** * Rendering using opengl will change the current viewport/context. @@ -92,22 +92,22 @@ float sequence_handle_size_get_clamped(const struct Scene *scene, * TODO: do not rely on such hack and just update the \a ibuf outside of * the UI drawing code. */ -struct ImBuf *sequencer_ibuf_get(struct Main *bmain, - struct ARegion *region, - struct Depsgraph *depsgraph, - struct Scene *scene, - struct SpaceSeq *sseq, - int timeline_frame, - int frame_ofs, - const char *viewname); +ImBuf *sequencer_ibuf_get(Main *bmain, + ARegion *region, + Depsgraph *depsgraph, + Scene *scene, + SpaceSeq *sseq, + int timeline_frame, + int frame_ofs, + const char *viewname); /* `sequencer_thumbnails.cc` */ void last_displayed_thumbnails_list_free(void *val); -void draw_seq_strip_thumbnail(struct View2D *v2d, - const struct bContext *C, - struct Scene *scene, - struct Sequence *seq, +void draw_seq_strip_thumbnail(View2D *v2d, + const bContext *C, + Scene *scene, + Sequence *seq, float y1, float y2, float pixelx, @@ -115,42 +115,35 @@ void draw_seq_strip_thumbnail(struct View2D *v2d, /* sequencer_draw_channels.c */ -void draw_channels(const struct bContext *C, struct ARegion *region); -void channel_draw_context_init(const struct bContext *C, - struct ARegion *region, - struct SeqChannelDrawContext *r_context); +void draw_channels(const bContext *C, ARegion *region); +void channel_draw_context_init(const bContext *C, + ARegion *region, + SeqChannelDrawContext *r_context); /* `sequencer_edit.cc` */ -struct View2D; -void seq_rectf(const struct Scene *scene, struct Sequence *seq, struct rctf *rectf); -struct Sequence *find_nearest_seq(struct Scene *scene, - struct View2D *v2d, - int *hand, - const int mval[2]); -struct Sequence *find_neighboring_sequence(struct Scene *scene, - struct Sequence *test, - int lr, - int sel); -void recurs_sel_seq(struct Sequence *seq_meta); -int seq_effect_find_selected(struct Scene *scene, - struct Sequence *activeseq, +void seq_rectf(const Scene *scene, Sequence *seq, rctf *rectf); +Sequence *find_nearest_seq(Scene *scene, View2D *v2d, int *hand, const int mval[2]); +Sequence *find_neighboring_sequence(Scene *scene, Sequence *test, int lr, int sel); +void recurs_sel_seq(Sequence *seq_meta); +int seq_effect_find_selected(Scene *scene, + Sequence *activeseq, int type, - struct Sequence **r_selseq1, - struct Sequence **r_selseq2, - struct Sequence **r_selseq3, + Sequence **r_selseq1, + Sequence **r_selseq2, + Sequence **r_selseq3, const char **r_error_str); /* Operator helpers. */ -bool sequencer_edit_poll(struct bContext *C); -bool sequencer_edit_with_channel_region_poll(struct bContext *C); -bool sequencer_editing_initialized_and_active(struct bContext *C); +bool sequencer_edit_poll(bContext *C); +bool sequencer_edit_with_channel_region_poll(bContext *C); +bool sequencer_editing_initialized_and_active(bContext *C); /* UNUSED */ -/* bool sequencer_strip_poll(struct bContext *C); */ -bool sequencer_strip_has_path_poll(struct bContext *C); -bool sequencer_view_has_preview_poll(struct bContext *C); -bool sequencer_view_preview_only_poll(const struct bContext *C); -bool sequencer_view_strips_poll(struct bContext *C); +/* bool sequencer_strip_poll( bContext *C); */ +bool sequencer_strip_has_path_poll(bContext *C); +bool sequencer_view_has_preview_poll(bContext *C); +bool sequencer_view_preview_only_poll(const bContext *C); +bool sequencer_view_strips_poll(bContext *C); /** * Returns collection with all strips presented to user. If operation is done in preview, @@ -159,7 +152,7 @@ bool sequencer_view_strips_poll(struct bContext *C); * \param C: context * \return collection of strips (`Sequence`) */ -struct SeqCollection *all_strips_from_context(struct bContext *C); +SeqCollection *all_strips_from_context(bContext *C); /** * Returns collection with selected strips presented to user. If operation is done in preview, @@ -169,158 +162,156 @@ struct SeqCollection *all_strips_from_context(struct bContext *C); * \param C: context * \return collection of strips (`Sequence`) */ -struct SeqCollection *selected_strips_from_context(struct bContext *C); +SeqCollection *selected_strips_from_context(bContext *C); /* Externs. */ extern EnumPropertyItem sequencer_prop_effect_types[]; extern EnumPropertyItem prop_side_types[]; /* Operators. */ -struct wmKeyConfig; -struct wmOperatorType; -void SEQUENCER_OT_split(struct wmOperatorType *ot); -void SEQUENCER_OT_slip(struct wmOperatorType *ot); -void SEQUENCER_OT_mute(struct wmOperatorType *ot); -void SEQUENCER_OT_unmute(struct wmOperatorType *ot); -void SEQUENCER_OT_lock(struct wmOperatorType *ot); -void SEQUENCER_OT_unlock(struct wmOperatorType *ot); -void SEQUENCER_OT_reload(struct wmOperatorType *ot); -void SEQUENCER_OT_refresh_all(struct wmOperatorType *ot); -void SEQUENCER_OT_reassign_inputs(struct wmOperatorType *ot); -void SEQUENCER_OT_swap_inputs(struct wmOperatorType *ot); -void SEQUENCER_OT_duplicate(struct wmOperatorType *ot); -void SEQUENCER_OT_delete(struct wmOperatorType *ot); -void SEQUENCER_OT_offset_clear(struct wmOperatorType *ot); -void SEQUENCER_OT_images_separate(struct wmOperatorType *ot); -void SEQUENCER_OT_meta_toggle(struct wmOperatorType *ot); -void SEQUENCER_OT_meta_make(struct wmOperatorType *ot); -void SEQUENCER_OT_meta_separate(struct wmOperatorType *ot); +void SEQUENCER_OT_split(wmOperatorType *ot); +void SEQUENCER_OT_slip(wmOperatorType *ot); +void SEQUENCER_OT_mute(wmOperatorType *ot); +void SEQUENCER_OT_unmute(wmOperatorType *ot); +void SEQUENCER_OT_lock(wmOperatorType *ot); +void SEQUENCER_OT_unlock(wmOperatorType *ot); +void SEQUENCER_OT_reload(wmOperatorType *ot); +void SEQUENCER_OT_refresh_all(wmOperatorType *ot); +void SEQUENCER_OT_reassign_inputs(wmOperatorType *ot); +void SEQUENCER_OT_swap_inputs(wmOperatorType *ot); +void SEQUENCER_OT_duplicate(wmOperatorType *ot); +void SEQUENCER_OT_delete(wmOperatorType *ot); +void SEQUENCER_OT_offset_clear(wmOperatorType *ot); +void SEQUENCER_OT_images_separate(wmOperatorType *ot); +void SEQUENCER_OT_meta_toggle(wmOperatorType *ot); +void SEQUENCER_OT_meta_make(wmOperatorType *ot); +void SEQUENCER_OT_meta_separate(wmOperatorType *ot); -void SEQUENCER_OT_gap_remove(struct wmOperatorType *ot); -void SEQUENCER_OT_gap_insert(struct wmOperatorType *ot); -void SEQUENCER_OT_snap(struct wmOperatorType *ot); +void SEQUENCER_OT_gap_remove(wmOperatorType *ot); +void SEQUENCER_OT_gap_insert(wmOperatorType *ot); +void SEQUENCER_OT_snap(wmOperatorType *ot); -void SEQUENCER_OT_strip_jump(struct wmOperatorType *ot); -void SEQUENCER_OT_swap(struct wmOperatorType *ot); -void SEQUENCER_OT_swap_data(struct wmOperatorType *ot); -void SEQUENCER_OT_rendersize(struct wmOperatorType *ot); +void SEQUENCER_OT_strip_jump(wmOperatorType *ot); +void SEQUENCER_OT_swap(wmOperatorType *ot); +void SEQUENCER_OT_swap_data(wmOperatorType *ot); +void SEQUENCER_OT_rendersize(wmOperatorType *ot); -void SEQUENCER_OT_change_effect_input(struct wmOperatorType *ot); -void SEQUENCER_OT_change_effect_type(struct wmOperatorType *ot); -void SEQUENCER_OT_change_path(struct wmOperatorType *ot); -void SEQUENCER_OT_change_scene(struct wmOperatorType *ot); +void SEQUENCER_OT_change_effect_input(wmOperatorType *ot); +void SEQUENCER_OT_change_effect_type(wmOperatorType *ot); +void SEQUENCER_OT_change_path(wmOperatorType *ot); +void SEQUENCER_OT_change_scene(wmOperatorType *ot); -void SEQUENCER_OT_copy(struct wmOperatorType *ot); -void SEQUENCER_OT_paste(struct wmOperatorType *ot); +void SEQUENCER_OT_copy(wmOperatorType *ot); +void SEQUENCER_OT_paste(wmOperatorType *ot); -void SEQUENCER_OT_rebuild_proxy(struct wmOperatorType *ot); -void SEQUENCER_OT_enable_proxies(struct wmOperatorType *ot); +void SEQUENCER_OT_rebuild_proxy(wmOperatorType *ot); +void SEQUENCER_OT_enable_proxies(wmOperatorType *ot); -void SEQUENCER_OT_export_subtitles(struct wmOperatorType *ot); +void SEQUENCER_OT_export_subtitles(wmOperatorType *ot); -void SEQUENCER_OT_set_range_to_strips(struct wmOperatorType *ot); -void SEQUENCER_OT_strip_transform_clear(struct wmOperatorType *ot); -void SEQUENCER_OT_strip_transform_fit(struct wmOperatorType *ot); +void SEQUENCER_OT_set_range_to_strips(wmOperatorType *ot); +void SEQUENCER_OT_strip_transform_clear(wmOperatorType *ot); +void SEQUENCER_OT_strip_transform_fit(wmOperatorType *ot); -void SEQUENCER_OT_strip_color_tag_set(struct wmOperatorType *ot); -void SEQUENCER_OT_cursor_set(struct wmOperatorType *ot); -void SEQUENCER_OT_scene_frame_range_update(struct wmOperatorType *ot); +void SEQUENCER_OT_strip_color_tag_set(wmOperatorType *ot); +void SEQUENCER_OT_cursor_set(wmOperatorType *ot); +void SEQUENCER_OT_scene_frame_range_update(wmOperatorType *ot); /* `sequencer_select.cc` */ -void SEQUENCER_OT_select_all(struct wmOperatorType *ot); -void SEQUENCER_OT_select(struct wmOperatorType *ot); -void SEQUENCER_OT_select_side_of_frame(struct wmOperatorType *ot); -void SEQUENCER_OT_select_more(struct wmOperatorType *ot); -void SEQUENCER_OT_select_less(struct wmOperatorType *ot); -void SEQUENCER_OT_select_linked(struct wmOperatorType *ot); -void SEQUENCER_OT_select_linked_pick(struct wmOperatorType *ot); -void SEQUENCER_OT_select_handles(struct wmOperatorType *ot); -void SEQUENCER_OT_select_side(struct wmOperatorType *ot); -void SEQUENCER_OT_select_box(struct wmOperatorType *ot); -void SEQUENCER_OT_select_inverse(struct wmOperatorType *ot); -void SEQUENCER_OT_select_grouped(struct wmOperatorType *ot); +void SEQUENCER_OT_select_all(wmOperatorType *ot); +void SEQUENCER_OT_select(wmOperatorType *ot); +void SEQUENCER_OT_select_side_of_frame(wmOperatorType *ot); +void SEQUENCER_OT_select_more(wmOperatorType *ot); +void SEQUENCER_OT_select_less(wmOperatorType *ot); +void SEQUENCER_OT_select_linked(wmOperatorType *ot); +void SEQUENCER_OT_select_linked_pick(wmOperatorType *ot); +void SEQUENCER_OT_select_handles(wmOperatorType *ot); +void SEQUENCER_OT_select_side(wmOperatorType *ot); +void SEQUENCER_OT_select_box(wmOperatorType *ot); +void SEQUENCER_OT_select_inverse(wmOperatorType *ot); +void SEQUENCER_OT_select_grouped(wmOperatorType *ot); /* `sequencer_add.cc` */ -void SEQUENCER_OT_scene_strip_add(struct wmOperatorType *ot); -void SEQUENCER_OT_scene_strip_add_new(struct wmOperatorType *ot); -void SEQUENCER_OT_movie_strip_add(struct wmOperatorType *ot); -void SEQUENCER_OT_movieclip_strip_add(struct wmOperatorType *ot); -void SEQUENCER_OT_mask_strip_add(struct wmOperatorType *ot); -void SEQUENCER_OT_sound_strip_add(struct wmOperatorType *ot); -void SEQUENCER_OT_image_strip_add(struct wmOperatorType *ot); -void SEQUENCER_OT_effect_strip_add(struct wmOperatorType *ot); +void SEQUENCER_OT_scene_strip_add(wmOperatorType *ot); +void SEQUENCER_OT_scene_strip_add_new(wmOperatorType *ot); +void SEQUENCER_OT_movie_strip_add(wmOperatorType *ot); +void SEQUENCER_OT_movieclip_strip_add(wmOperatorType *ot); +void SEQUENCER_OT_mask_strip_add(wmOperatorType *ot); +void SEQUENCER_OT_sound_strip_add(wmOperatorType *ot); +void SEQUENCER_OT_image_strip_add(wmOperatorType *ot); +void SEQUENCER_OT_effect_strip_add(wmOperatorType *ot); /* `sequencer_drag_drop.cc` */ -void sequencer_dropboxes(void); +void sequencer_dropboxes(); /* `sequencer_ops.cc` */ -void sequencer_operatortypes(void); -void sequencer_keymap(struct wmKeyConfig *keyconf); +void sequencer_operatortypes(); +void sequencer_keymap(wmKeyConfig *keyconf); /* sequencer_scope.c */ -struct ImBuf *make_waveform_view_from_ibuf(struct ImBuf *ibuf); -struct ImBuf *make_sep_waveform_view_from_ibuf(struct ImBuf *ibuf); -struct ImBuf *make_vectorscope_view_from_ibuf(struct ImBuf *ibuf); -struct ImBuf *make_zebra_view_from_ibuf(struct ImBuf *ibuf, float perc); -struct ImBuf *make_histogram_view_from_ibuf(struct ImBuf *ibuf); +ImBuf *make_waveform_view_from_ibuf(ImBuf *ibuf); +ImBuf *make_sep_waveform_view_from_ibuf(ImBuf *ibuf); +ImBuf *make_vectorscope_view_from_ibuf(ImBuf *ibuf); +ImBuf *make_zebra_view_from_ibuf(ImBuf *ibuf, float perc); +ImBuf *make_histogram_view_from_ibuf(ImBuf *ibuf); /* `sequencer_buttons.cc` */ -void sequencer_buttons_register(struct ARegionType *art); +void sequencer_buttons_register(ARegionType *art); /* sequencer_modifiers.c */ -void SEQUENCER_OT_strip_modifier_add(struct wmOperatorType *ot); -void SEQUENCER_OT_strip_modifier_remove(struct wmOperatorType *ot); -void SEQUENCER_OT_strip_modifier_move(struct wmOperatorType *ot); -void SEQUENCER_OT_strip_modifier_copy(struct wmOperatorType *ot); -void SEQUENCER_OT_strip_modifier_equalizer_redefine(struct wmOperatorType *ot); +void SEQUENCER_OT_strip_modifier_add(wmOperatorType *ot); +void SEQUENCER_OT_strip_modifier_remove(wmOperatorType *ot); +void SEQUENCER_OT_strip_modifier_move(wmOperatorType *ot); +void SEQUENCER_OT_strip_modifier_copy(wmOperatorType *ot); +void SEQUENCER_OT_strip_modifier_equalizer_redefine(wmOperatorType *ot); /* `sequencer_view.cc` */ -void SEQUENCER_OT_sample(struct wmOperatorType *ot); -void SEQUENCER_OT_view_all(struct wmOperatorType *ot); -void SEQUENCER_OT_view_frame(struct wmOperatorType *ot); -void SEQUENCER_OT_view_all_preview(struct wmOperatorType *ot); -void SEQUENCER_OT_view_zoom_ratio(struct wmOperatorType *ot); -void SEQUENCER_OT_view_selected(struct wmOperatorType *ot); -void SEQUENCER_OT_view_ghost_border(struct wmOperatorType *ot); +void SEQUENCER_OT_sample(wmOperatorType *ot); +void SEQUENCER_OT_view_all(wmOperatorType *ot); +void SEQUENCER_OT_view_frame(wmOperatorType *ot); +void SEQUENCER_OT_view_all_preview(wmOperatorType *ot); +void SEQUENCER_OT_view_zoom_ratio(wmOperatorType *ot); +void SEQUENCER_OT_view_selected(wmOperatorType *ot); +void SEQUENCER_OT_view_ghost_border(wmOperatorType *ot); /* `sequencer_channels_edit.cc` */ -void SEQUENCER_OT_rename_channel(struct wmOperatorType *ot); +void SEQUENCER_OT_rename_channel(wmOperatorType *ot); /* `sequencer_preview.cc` */ -void sequencer_preview_add_sound(const struct bContext *C, struct Sequence *seq); +void sequencer_preview_add_sound(const bContext *C, Sequence *seq); /* `sequencer_add.cc` */ -int sequencer_image_seq_get_minmax_frame(struct wmOperator *op, +int sequencer_image_seq_get_minmax_frame(wmOperator *op, int sfra, int *r_minframe, int *r_numdigits); void sequencer_image_seq_reserve_frames( - struct wmOperator *op, struct StripElem *se, int len, int minframe, int numdigits); + wmOperator *op, StripElem *se, int len, int minframe, int numdigits); /* `sequencer_retiming.cc` */ -void SEQUENCER_OT_retiming_reset(struct wmOperatorType *ot); -void SEQUENCER_OT_retiming_handle_move(struct wmOperatorType *ot); -void SEQUENCER_OT_retiming_handle_add(struct wmOperatorType *ot); -void SEQUENCER_OT_retiming_handle_remove(struct wmOperatorType *ot); -void SEQUENCER_OT_retiming_segment_speed_set(struct wmOperatorType *ot); +void SEQUENCER_OT_retiming_reset(wmOperatorType *ot); +void SEQUENCER_OT_retiming_handle_move(wmOperatorType *ot); +void SEQUENCER_OT_retiming_handle_add(wmOperatorType *ot); +void SEQUENCER_OT_retiming_handle_remove(wmOperatorType *ot); +void SEQUENCER_OT_retiming_segment_speed_set(wmOperatorType *ot); /* `sequencer_gizmo_retime.cc` */ -void SEQUENCER_GGT_gizmo_retime(struct wmGizmoGroupType *gzgt); +void SEQUENCER_GGT_gizmo_retime(wmGizmoGroupType *gzgt); /* `sequencer_gizmo_retime_type.cc` */ -void GIZMO_GT_retime_handle_add(struct wmGizmoType *gzt); -void GIZMO_GT_retime_handle(struct wmGizmoType *gzt); -void GIZMO_GT_retime_remove(struct wmGizmoType *gzt); -void GIZMO_GT_speed_set_remove(struct wmGizmoType *gzt); +void GIZMO_GT_retime_handle_add(wmGizmoType *gzt); +void GIZMO_GT_retime_handle(wmGizmoType *gzt); +void GIZMO_GT_retime_remove(wmGizmoType *gzt); +void GIZMO_GT_speed_set_remove(wmGizmoType *gzt); diff --git a/source/blender/editors/space_view3d/space_view3d.cc b/source/blender/editors/space_view3d/space_view3d.cc index 0b63d07a9b5..15822ac0361 100644 --- a/source/blender/editors/space_view3d/space_view3d.cc +++ b/source/blender/editors/space_view3d/space_view3d.cc @@ -202,13 +202,13 @@ void ED_view3d_init_mats_rv3d_gl(const Object *ob, RegionView3D *rv3d) } #ifdef DEBUG -void ED_view3d_clear_mats_rv3d(struct RegionView3D *rv3d) +void ED_view3d_clear_mats_rv3d(RegionView3D *rv3d) { zero_m4(rv3d->viewmatob); zero_m4(rv3d->persmatob); } -void ED_view3d_check_mats_rv3d(struct RegionView3D *rv3d) +void ED_view3d_check_mats_rv3d(RegionView3D *rv3d) { BLI_ASSERT_ZERO_M4(rv3d->viewmatob); BLI_ASSERT_ZERO_M4(rv3d->persmatob); diff --git a/source/blender/makesrna/intern/rna_node_socket.cc b/source/blender/makesrna/intern/rna_node_socket.cc index f5b15112c2a..d64a9adc3cf 100644 --- a/source/blender/makesrna/intern/rna_node_socket.cc +++ b/source/blender/makesrna/intern/rna_node_socket.cc @@ -321,7 +321,7 @@ static void rna_NodeSocketStandard_draw_color( sock->typeinfo->draw_color(C, &ptr, nodeptr, r_color); } -static void rna_NodeSocketStandard_draw_color_simple(struct StructRNA *type, float r_color[4]) +static void rna_NodeSocketStandard_draw_color_simple(StructRNA *type, float r_color[4]) { const bNodeSocketType *typeinfo = static_cast( RNA_struct_blender_type_get(type)); diff --git a/source/blender/makesrna/intern/rna_node_tree_interface.cc b/source/blender/makesrna/intern/rna_node_tree_interface.cc index b705320ca93..3269351eff5 100644 --- a/source/blender/makesrna/intern/rna_node_tree_interface.cc +++ b/source/blender/makesrna/intern/rna_node_tree_interface.cc @@ -785,9 +785,9 @@ static int rna_NodeTreeInterface_items_lookup_int(PointerRNA *ptr, int index, Po return true; } -static int rna_NodeTreeInterface_items_lookup_string(struct PointerRNA *ptr, +static int rna_NodeTreeInterface_items_lookup_string(PointerRNA *ptr, const char *key, - struct PointerRNA *r_ptr) + PointerRNA *r_ptr) { bNodeTree *ntree = reinterpret_cast(ptr->owner_id); if (!ntree->runtime) { diff --git a/source/blender/makesrna/intern/rna_ui_api.cc b/source/blender/makesrna/intern/rna_ui_api.cc index 434f3e68a8a..6784e723c3e 100644 --- a/source/blender/makesrna/intern/rna_ui_api.cc +++ b/source/blender/makesrna/intern/rna_ui_api.cc @@ -499,7 +499,7 @@ static void rna_uiItemPopoverPanelFromGroup(uiLayout *layout, uiItemPopoverPanelFromGroup(layout, C, space_id, region_id, context, category); } -static void rna_uiItemProgress(struct uiLayout *layout, +static void rna_uiItemProgress(uiLayout *layout, const char *text, const char *text_ctxt, bool translate,