Differential D2889 Diff 10204 source/blender/editors/interface/interface_icons.c

Changeset View

Standalone View

source/blender/editors/interface/interface_icons.c

Context not available.
	#include "DNA_brush_types.h"	#include "DNA_brush_types.h"
	#include "DNA_curve_types.h"	#include "DNA_curve_types.h"
	#include "DNA_dynamicpaint_types.h"	#include "DNA_dynamicpaint_types.h"
		#include "DNA_gpencil_types.h"
	#include "DNA_object_types.h"	#include "DNA_object_types.h"
	#include "DNA_screen_types.h"	#include "DNA_screen_types.h"
	#include "DNA_space_types.h"	#include "DNA_space_types.h"
Context not available.
	INIT_BRUSH_ICON(ICON_BRUSH_THUMB, thumb);	INIT_BRUSH_ICON(ICON_BRUSH_THUMB, thumb);
	INIT_BRUSH_ICON(ICON_BRUSH_ROTATE, twist);	INIT_BRUSH_ICON(ICON_BRUSH_ROTATE, twist);
	INIT_BRUSH_ICON(ICON_BRUSH_VERTEXDRAW, vertexdraw);	INIT_BRUSH_ICON(ICON_BRUSH_VERTEXDRAW, vertexdraw);

		/* grease pencil sculpt */
		INIT_BRUSH_ICON(ICON_GPBRUSH_SMOOTH, gp_brush_smooth);
		INIT_BRUSH_ICON(ICON_GPBRUSH_THICKNESS, gp_brush_thickness);
		INIT_BRUSH_ICON(ICON_GPBRUSH_STRENGTH, gp_brush_strength);
		INIT_BRUSH_ICON(ICON_GPBRUSH_GRAB, gp_brush_grab);
		INIT_BRUSH_ICON(ICON_GPBRUSH_PUSH, gp_brush_push);
		INIT_BRUSH_ICON(ICON_GPBRUSH_TWIST, gp_brush_twist);
		INIT_BRUSH_ICON(ICON_GPBRUSH_PINCH, gp_brush_pinch);
		INIT_BRUSH_ICON(ICON_GPBRUSH_RANDOMIZE, gp_brush_randomize);
		INIT_BRUSH_ICON(ICON_GPBRUSH_CLONE, gp_brush_clone);
		INIT_BRUSH_ICON(ICON_GPBRUSH_WEIGHT, gp_brush_weight);

		/* grease pencil drawing brushes */
		INIT_BRUSH_ICON(ICON_GPBRUSH_PENCIL, gp_brush_pencil);
		INIT_BRUSH_ICON(ICON_GPBRUSH_PEN, gp_brush_pen);
		INIT_BRUSH_ICON(ICON_GPBRUSH_INK, gp_brush_ink);
		INIT_BRUSH_ICON(ICON_GPBRUSH_INKNOISE, gp_brush_inknoise);
		INIT_BRUSH_ICON(ICON_GPBRUSH_BLOCK, gp_brush_block);
		INIT_BRUSH_ICON(ICON_GPBRUSH_MARKER, gp_brush_marker);
		INIT_BRUSH_ICON(ICON_GPBRUSH_CUSTOM, gp_brush_custom);
		INIT_BRUSH_ICON(ICON_GPBRUSH_FILL, gp_brush_fill);
		/* Use same png for 3 eraser brusehs while decide new design */
		INIT_BRUSH_ICON(ICON_GPBRUSH_ERASE_SOFT, gp_brush_erase_soft);
		INIT_BRUSH_ICON(ICON_GPBRUSH_ERASE_HARD, gp_brush_erase_soft);
		INIT_BRUSH_ICON(ICON_GPBRUSH_ERASE_STROKE, gp_brush_erase_soft);

	#undef INIT_BRUSH_ICON	#undef INIT_BRUSH_ICON
	}	}
Context not available.
	}	}

	/* reset the icon */	/* reset the icon */
	if (mode == OB_MODE_SCULPT) {	if (workspace->object_mode & OB_MODE_GPENCIL_PAINT) {
		switch (br->gp_icon_id) {
		case GPBRUSH_CUSTOM:
		br->id.icon_id = ICON_GPBRUSH_CUSTOM;
		break;
		case GPBRUSH_PENCIL:
		br->id.icon_id = ICON_GPBRUSH_PENCIL;
		break;
		case GPBRUSH_PEN:
		br->id.icon_id = ICON_GPBRUSH_PEN;
		break;
		case GPBRUSH_INK:
		br->id.icon_id = ICON_GPBRUSH_INK;
		break;
		case GPBRUSH_INKNOISE:
		br->id.icon_id = ICON_GPBRUSH_INKNOISE;
		break;
		case GPBRUSH_BLOCK:
		br->id.icon_id = ICON_GPBRUSH_BLOCK;
		break;
		case GPBRUSH_MARKER:
		br->id.icon_id = ICON_GPBRUSH_MARKER;
		break;
		case GPBRUSH_FILL:
		br->id.icon_id = ICON_GPBRUSH_FILL;
		break;
		case GPBRUSH_ERASE_SOFT:
		br->id.icon_id = ICON_GPBRUSH_ERASE_SOFT;
		break;
		case GPBRUSH_ERASE_HARD:
		br->id.icon_id = ICON_GPBRUSH_ERASE_HARD;
		break;
		case GPBRUSH_ERASE_STROKE:
		br->id.icon_id = ICON_GPBRUSH_ERASE_STROKE;
		break;
		default:
		br->id.icon_id = ICON_GPBRUSH_CUSTOM;
		break;
		}
		return id->icon_id;
		}
		else if (mode == OB_MODE_SCULPT) {
	items = rna_enum_brush_sculpt_tool_items;	items = rna_enum_brush_sculpt_tool_items;
	tool = br->sculpt_tool;	tool = br->sculpt_tool;
	}	}
Context not available.