Differential D2889 Diff 9436 source/blender/editors/space_outliner/outliner_draw.c

Changeset View

Standalone View

source/blender/editors/space_outliner/outliner_draw.c

Show First 20 Lines • Show All 1,049 Lines • ▼ Show 20 Lines	switch (tselem->type) {
ICON_DRAW(ICON_MOD_DATA_TRANSFER);		ICON_DRAW(ICON_MOD_DATA_TRANSFER);
break;		break;
case eModifierType_NormalEdit:		case eModifierType_NormalEdit:
ICON_DRAW(ICON_MOD_NORMALEDIT);		ICON_DRAW(ICON_MOD_NORMALEDIT);
break;		break;
/* Default */		/* Default */
case eModifierType_None:		case eModifierType_None:
case eModifierType_ShapeKey:		case eModifierType_ShapeKey:
		case eModifierType_GpencilNoise:
		case eModifierType_GpencilSubdiv:
		case eModifierType_GpencilThick:
		case eModifierType_GpencilTint:
		case eModifierType_GpencilArray:
		case eModifierType_GpencilDupli:
		case eModifierType_GpencilOpacity:
		case eModifierType_GpencilColor:
		case eModifierType_GpencilLattice:
		case eModifierType_GpencilSimplify:
		case eModifierType_GpencilBlur:
		case eModifierType_GpencilWave:
		case eModifierType_GpencilPixel:
		case eModifierType_GpencilSwirl:

case NUM_MODIFIER_TYPES:		case NUM_MODIFIER_TYPES:
ICON_DRAW(ICON_DOT);		ICON_DRAW(ICON_DOT);
break;		break;
}		}
break;		break;
}		}
case TSE_POSE_BASE:		case TSE_POSE_BASE:
ICON_DRAW(ICON_ARMATURE_DATA);		ICON_DRAW(ICON_ARMATURE_DATA);
▲ Show 20 Lines • Show All 81 Lines • ▼ Show 20 Lines	if (GS(tselem->id->name) == ID_OB) {
case OB_FONT:		case OB_FONT:
tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_FONT); break;		tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_FONT); break;
case OB_SURF:		case OB_SURF:
tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_SURFACE); break;		tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_SURFACE); break;
case OB_SPEAKER:		case OB_SPEAKER:
tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_SPEAKER); break;		tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_SPEAKER); break;
case OB_EMPTY:		case OB_EMPTY:
tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_EMPTY); break;		tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_EMPTY); break;
		case OB_GPENCIL:
		tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_GPENCIL); break;
}		}
}		}
else {		else {
/* TODO(sergey): Casting to short here just to handle ID_NLA which is		/* TODO(sergey): Casting to short here just to handle ID_NLA which is
* NOT inside of IDType enum.		* NOT inside of IDType enum.
*/		*/
switch ((short)GS(tselem->id->name)) {		switch ((short)GS(tselem->id->name)) {
case ID_SCE:		case ID_SCE:
▲ Show 20 Lines • Show All 59 Lines • ▼ Show 20 Lines	else {
}		}
else {		else {
tselem_draw_icon_uibut(&arg, ICON_LIBRARY_DATA_DIRECT);		tselem_draw_icon_uibut(&arg, ICON_LIBRARY_DATA_DIRECT);
}		}
break;		break;
case ID_LS:		case ID_LS:
tselem_draw_icon_uibut(&arg, ICON_LINE_DATA); break;		tselem_draw_icon_uibut(&arg, ICON_LINE_DATA); break;
case ID_GD:		case ID_GD:
tselem_draw_icon_uibut(&arg, ICON_GREASEPENCIL); break;		tselem_draw_icon_uibut(&arg, ICON_OUTLINER_DATA_GPENCIL); break;
default:		default:
break;		break;
}		}
}		}
}		}

#undef ICON_DRAW		#undef ICON_DRAW
}		}
▲ Show 20 Lines • Show All 738 Lines • Show Last 20 Lines