Differential D578 Diff 1833 source/blender/editors/interface/interface.c

Changeset View

Standalone View

source/blender/editors/interface/interface.c

Context not available.
	}	}
	}	}

		campbellbartonAuthorUnsubmitted Not Done Inline Actions simply extracted from `uiEndBlock`, no functional changes. campbellbarton: simply extracted from `uiEndBlock`, no functional changes.
	void uiEndBlock(const bContext C, uiBlock block)	void uiBlockUpdateFromOld(const bContext C, uiBlock block)
	{	{
	const bool has_old = (block->oldblock != NULL);	uiBut *but_old;
	/* avoid searches when old/new lists align */
	uiBut *but_old = has_old ? block->oldblock->buttons.first : NULL;

	uiBut *but;	uiBut *but;
	Scene *scene = CTX_data_scene(C);

		if (!block->oldblock)
		return;

		but_old = block->oldblock->buttons.first;

	if (has_old && BLI_listbase_is_empty(&block->oldblock->butstore) == false) {	if (BLI_listbase_is_empty(&block->oldblock->butstore) == false) {
	UI_butstore_update(block);	UI_butstore_update(block);
	}	}

		for (but = block->buttons.first; but; but = but->next) {
		if (ui_but_update_from_old_block(C, block, &but, &but_old)) {
		ui_check_but(but);
		}
		}

		block->auto_open = block->oldblock->auto_open;
		block->auto_open_last = block->oldblock->auto_open_last;
		block->tooltipdisabled = block->oldblock->tooltipdisabled;
		copy_v3_v3(ui_block_hsv_get(block),
		ui_block_hsv_get(block->oldblock));

		block->oldblock = NULL;
		}

		void uiEndBlock(const bContext C, uiBlock block)
		{
		uiBut *but;
		Scene *scene = CTX_data_scene(C);

		BLI_assert(block->active);

		uiBlockUpdateFromOld(C, block);

	/* inherit flags from 'old' buttons that was drawn here previous, based	/* inherit flags from 'old' buttons that was drawn here previous, based
	* on matching buttons, we need this to make button event handling non	* on matching buttons, we need this to make button event handling non
	* blocking, while still allowing buttons to be remade each redraw as it	* blocking, while still allowing buttons to be remade each redraw as it
	* is expected by blender code */	* is expected by blender code */
	for (but = block->buttons.first; but; but = but->next) {	for (but = block->buttons.first; but; but = but->next) {
	if (has_old && ui_but_update_from_old_block(C, block, &but, &but_old)) {
	ui_check_but(but);
	}

	/* temp? Proper check for graying out */	/* temp? Proper check for graying out */
	if (but->optype) {	if (but->optype) {
	wmOperatorType *ot = but->optype;	wmOperatorType *ot = but->optype;
Context not available.
	ui_but_anim_flag(but, (scene) ? scene->r.cfra : 0.0f);	ui_but_anim_flag(but, (scene) ? scene->r.cfra : 0.0f);
	}	}

	if (block->oldblock) {
	block->auto_open = block->oldblock->auto_open;
	block->auto_open_last = block->oldblock->auto_open_last;
	block->tooltipdisabled = block->oldblock->tooltipdisabled;
	copy_v3_v3(ui_block_hsv_get(block),
	ui_block_hsv_get(block->oldblock));

	block->oldblock = NULL;
	}

	/* handle pending stuff */	/* handle pending stuff */
	if (block->layouts.first) {	if (block->layouts.first) {
Context not available.
	if (oldblock) {	if (oldblock) {
	oldblock->active = 0;	oldblock->active = 0;
	oldblock->panel = NULL;	oldblock->panel = NULL;
		oldblock->handle = NULL;
	}	}

	/* at the beginning of the list! for dynamical menus/blocks */	/* at the beginning of the list! for dynamical menus/blocks */
Context not available.