[Bf-blender-cvs] [e1f7ea1f0f7] topbar: Get rid of left over from redo panel in clip editor

Julian Eisel noreply at git.blender.org
Fri Nov 24 14:46:28 CET 2017


Commit: e1f7ea1f0f77c3b8f1502c3a261096bfd035fcf1
Author: Julian Eisel
Date:   Thu Nov 23 20:49:22 2017 +0100
Branches: topbar
https://developer.blender.org/rBe1f7ea1f0f77c3b8f1502c3a261096bfd035fcf1

Get rid of left over from redo panel in clip editor

===================================================================

M	source/blender/editors/space_clip/clip_intern.h
M	source/blender/editors/space_clip/clip_toolbar.c

===================================================================

diff --git a/source/blender/editors/space_clip/clip_intern.h b/source/blender/editors/space_clip/clip_intern.h
index ffc7a41f0aa..60736cfb885 100644
--- a/source/blender/editors/space_clip/clip_intern.h
+++ b/source/blender/editors/space_clip/clip_intern.h
@@ -120,7 +120,6 @@ void CLIP_OT_cursor_set(struct wmOperatorType *ot);
 struct ARegion *ED_clip_has_properties_region(struct ScrArea *sa);
 void CLIP_OT_tools(struct wmOperatorType *ot);
 void CLIP_OT_properties(struct wmOperatorType *ot);
-void ED_clip_tool_props_register(struct ARegionType *art);
 
 /* clip_utils.c */
 void clip_graph_tracking_values_iterate_track(struct SpaceClip *sc, struct MovieTrackingTrack *track, void *userdata,
diff --git a/source/blender/editors/space_clip/clip_toolbar.c b/source/blender/editors/space_clip/clip_toolbar.c
index db34854c6c4..49d0617ba26 100644
--- a/source/blender/editors/space_clip/clip_toolbar.c
+++ b/source/blender/editors/space_clip/clip_toolbar.c
@@ -176,78 +176,3 @@ void CLIP_OT_tools(wmOperatorType *ot)
 	ot->exec = tools_exec;
 	ot->poll = tools_poll;
 }
-
-/************************** redo panel ******************************/
-
-static void clip_panel_operator_redo_buts(const bContext *C, Panel *pa, wmOperator *op)
-{
-	uiTemplateOperatorPropertyButs(C, pa->layout, op, NULL, UI_BUT_LABEL_ALIGN_COLUMN, 0);
-}
-
-static void clip_panel_operator_redo_header(const bContext *C, Panel *pa)
-{
-	wmOperator *op = WM_operator_last_redo(C);
-
-	if (op)
-		BLI_strncpy(pa->drawname, RNA_struct_ui_name(op->type->srna), sizeof(pa->drawname));
-	else
-		BLI_strncpy(pa->drawname, IFACE_("Operator"), sizeof(pa->drawname));
-}
-
-static void clip_panel_operator_redo_operator(const bContext *C, Panel *pa, wmOperator *op)
-{
-	if (op->type->flag & OPTYPE_MACRO) {
-		for (op = op->macro.first; op; op = op->next) {
-			uiItemL(pa->layout, RNA_struct_ui_name(op->type->srna), ICON_NONE);
-			clip_panel_operator_redo_operator(C, pa, op);
-		}
-	}
-	else {
-		clip_panel_operator_redo_buts(C, pa, op);
-	}
-}
-
-/* TODO de-duplicate redo panel functions - campbell */
-static void clip_panel_operator_redo(const bContext *C, Panel *pa)
-{
-	wmOperator *op = WM_operator_last_redo(C);
-	ARegion *ar;
-	ARegion *ar1;
-
-	if (op == NULL)
-		return;
-
-	/* keep in sync with logic in ED_undo_operator_repeat() */
-	ar = CTX_wm_region(C);
-	ar1 = BKE_area_find_region_type(CTX_wm_area(C), RGN_TYPE_WINDOW);
-	if (ar1)
-		CTX_wm_region_set((bContext *)C, ar1);
-
-	if (WM_operator_poll((bContext *)C, op->type)) {
-		uiBlock *block = uiLayoutGetBlock(pa->layout);
-
-		if (!WM_operator_check_ui_enabled(C, op->type->name))
-			uiLayoutSetEnabled(pa->layout, false);
-
-		/* note, blockfunc is a default but->func, use Handle func to allow button callbacks too */
-		UI_block_func_handle_set(block, ED_undo_operator_repeat_cb_evt, op);
-
-		clip_panel_operator_redo_operator(C, pa, op);
-	}
-
-	/* set region back */
-	CTX_wm_region_set((bContext *)C, ar);
-}
-
-void ED_clip_tool_props_register(ARegionType *art)
-{
-	PanelType *pt;
-
-	pt = MEM_callocN(sizeof(PanelType), "spacetype clip panel last operator");
-	strcpy(pt->idname, "CLIP_PT_last_operator");
-	strcpy(pt->label, N_("Operator"));
-	strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA);
-	pt->draw_header = clip_panel_operator_redo_header;
-	pt->draw = clip_panel_operator_redo;
-	BLI_addtail(&art->paneltypes, pt);
-}



More information about the Bf-blender-cvs mailing list