Changeset View
Changeset View
Standalone View
Standalone View
source/blender/editors/space_outliner/outliner_draw.c
| Show All 26 Lines | |||||
| /** \file blender/editors/space_outliner/outliner_draw.c | /** \file blender/editors/space_outliner/outliner_draw.c | ||||
| * \ingroup spoutliner | * \ingroup spoutliner | ||||
| */ | */ | ||||
| #include "DNA_anim_types.h" | #include "DNA_anim_types.h" | ||||
| #include "DNA_armature_types.h" | #include "DNA_armature_types.h" | ||||
| #include "DNA_gpencil_types.h" | #include "DNA_gpencil_types.h" | ||||
| #include "DNA_gpencil_modifier_types.h" | |||||
| #include "DNA_group_types.h" | #include "DNA_group_types.h" | ||||
| #include "DNA_lamp_types.h" | #include "DNA_lamp_types.h" | ||||
| #include "DNA_lightprobe_types.h" | #include "DNA_lightprobe_types.h" | ||||
| #include "DNA_object_types.h" | #include "DNA_object_types.h" | ||||
| #include "DNA_scene_types.h" | #include "DNA_scene_types.h" | ||||
| #include "DNA_sequence_types.h" | #include "DNA_sequence_types.h" | ||||
| #include "BLI_math.h" | #include "BLI_math.h" | ||||
| ▲ Show 20 Lines • Show All 802 Lines • ▼ Show 20 Lines | switch (tselem->type) { | ||||
| ICON_DRAW(ICON_OBJECT_DATA); | ICON_DRAW(ICON_OBJECT_DATA); | ||||
| break; | break; | ||||
| case TSE_LINKED_PSYS: | case TSE_LINKED_PSYS: | ||||
| ICON_DRAW(ICON_PARTICLES); | ICON_DRAW(ICON_PARTICLES); | ||||
| break; | break; | ||||
| case TSE_MODIFIER: | case TSE_MODIFIER: | ||||
| { | { | ||||
| Object *ob = (Object *)tselem->id; | Object *ob = (Object *)tselem->id; | ||||
| if (ob->type != OB_GPENCIL) { | |||||
aligorith: I'd probably have put the GP cases first (since GP ones are the exception here), but either way… | |||||
| ModifierData *md = BLI_findlink(&ob->modifiers, tselem->nr); | ModifierData *md = BLI_findlink(&ob->modifiers, tselem->nr); | ||||
| switch ((ModifierType)md->type) { | switch ((ModifierType)md->type) { | ||||
| case eModifierType_Subsurf: | case eModifierType_Subsurf: | ||||
| ICON_DRAW(ICON_MOD_SUBSURF); | ICON_DRAW(ICON_MOD_SUBSURF); | ||||
| break; | break; | ||||
| case eModifierType_Armature: | case eModifierType_Armature: | ||||
| ICON_DRAW(ICON_MOD_ARMATURE); | ICON_DRAW(ICON_MOD_ARMATURE); | ||||
| break; | break; | ||||
| case eModifierType_Lattice: | case eModifierType_Lattice: | ||||
| ICON_DRAW(ICON_MOD_LATTICE); | ICON_DRAW(ICON_MOD_LATTICE); | ||||
| break; | break; | ||||
| case eModifierType_Curve: | case eModifierType_Curve: | ||||
| ICON_DRAW(ICON_MOD_CURVE); | ICON_DRAW(ICON_MOD_CURVE); | ||||
| break; | break; | ||||
| case eModifierType_Build: | case eModifierType_Build: | ||||
| ICON_DRAW(ICON_MOD_BUILD); | ICON_DRAW(ICON_MOD_BUILD); | ||||
| break; | break; | ||||
| case eModifierType_Mirror: | case eModifierType_Mirror: | ||||
| ICON_DRAW(ICON_MOD_MIRROR); | ICON_DRAW(ICON_MOD_MIRROR); | ||||
| break; | break; | ||||
| case eModifierType_Decimate: | case eModifierType_Decimate: | ||||
| ICON_DRAW(ICON_MOD_DECIM); | ICON_DRAW(ICON_MOD_DECIM); | ||||
| break; | break; | ||||
| case eModifierType_Wave: | case eModifierType_Wave: | ||||
| ICON_DRAW(ICON_MOD_WAVE); | ICON_DRAW(ICON_MOD_WAVE); | ||||
| break; | break; | ||||
| case eModifierType_Hook: | case eModifierType_Hook: | ||||
| ICON_DRAW(ICON_HOOK); | ICON_DRAW(ICON_HOOK); | ||||
| break; | break; | ||||
| case eModifierType_Softbody: | case eModifierType_Softbody: | ||||
| ICON_DRAW(ICON_MOD_SOFT); | ICON_DRAW(ICON_MOD_SOFT); | ||||
| break; | break; | ||||
| case eModifierType_Boolean: | case eModifierType_Boolean: | ||||
| ICON_DRAW(ICON_MOD_BOOLEAN); | ICON_DRAW(ICON_MOD_BOOLEAN); | ||||
| break; | break; | ||||
| case eModifierType_ParticleSystem: | case eModifierType_ParticleSystem: | ||||
| ICON_DRAW(ICON_MOD_PARTICLES); | ICON_DRAW(ICON_MOD_PARTICLES); | ||||
| break; | break; | ||||
| case eModifierType_ParticleInstance: | case eModifierType_ParticleInstance: | ||||
| ICON_DRAW(ICON_MOD_PARTICLES); | ICON_DRAW(ICON_MOD_PARTICLES); | ||||
| break; | break; | ||||
| case eModifierType_EdgeSplit: | case eModifierType_EdgeSplit: | ||||
| ICON_DRAW(ICON_MOD_EDGESPLIT); | ICON_DRAW(ICON_MOD_EDGESPLIT); | ||||
| break; | break; | ||||
| case eModifierType_Array: | case eModifierType_Array: | ||||
| ICON_DRAW(ICON_MOD_ARRAY); | ICON_DRAW(ICON_MOD_ARRAY); | ||||
| break; | break; | ||||
| case eModifierType_UVProject: | case eModifierType_UVProject: | ||||
| case eModifierType_UVWarp: /* TODO, get own icon */ | case eModifierType_UVWarp: /* TODO, get own icon */ | ||||
| ICON_DRAW(ICON_MOD_UVPROJECT); | ICON_DRAW(ICON_MOD_UVPROJECT); | ||||
| break; | break; | ||||
| case eModifierType_Displace: | case eModifierType_Displace: | ||||
| ICON_DRAW(ICON_MOD_DISPLACE); | ICON_DRAW(ICON_MOD_DISPLACE); | ||||
| break; | break; | ||||
| case eModifierType_Shrinkwrap: | case eModifierType_Shrinkwrap: | ||||
| ICON_DRAW(ICON_MOD_SHRINKWRAP); | ICON_DRAW(ICON_MOD_SHRINKWRAP); | ||||
| break; | break; | ||||
| case eModifierType_Cast: | case eModifierType_Cast: | ||||
| ICON_DRAW(ICON_MOD_CAST); | ICON_DRAW(ICON_MOD_CAST); | ||||
| break; | break; | ||||
| case eModifierType_MeshDeform: | case eModifierType_MeshDeform: | ||||
| case eModifierType_SurfaceDeform: | case eModifierType_SurfaceDeform: | ||||
| ICON_DRAW(ICON_MOD_MESHDEFORM); | ICON_DRAW(ICON_MOD_MESHDEFORM); | ||||
| break; | break; | ||||
| case eModifierType_Bevel: | case eModifierType_Bevel: | ||||
| ICON_DRAW(ICON_MOD_BEVEL); | ICON_DRAW(ICON_MOD_BEVEL); | ||||
| break; | break; | ||||
| case eModifierType_Smooth: | case eModifierType_Smooth: | ||||
| case eModifierType_LaplacianSmooth: | case eModifierType_LaplacianSmooth: | ||||
| case eModifierType_CorrectiveSmooth: | case eModifierType_CorrectiveSmooth: | ||||
| ICON_DRAW(ICON_MOD_SMOOTH); | ICON_DRAW(ICON_MOD_SMOOTH); | ||||
| break; | break; | ||||
| case eModifierType_SimpleDeform: | case eModifierType_SimpleDeform: | ||||
| ICON_DRAW(ICON_MOD_SIMPLEDEFORM); | ICON_DRAW(ICON_MOD_SIMPLEDEFORM); | ||||
| break; | break; | ||||
| case eModifierType_Mask: | case eModifierType_Mask: | ||||
| ICON_DRAW(ICON_MOD_MASK); | ICON_DRAW(ICON_MOD_MASK); | ||||
| break; | break; | ||||
| case eModifierType_Cloth: | case eModifierType_Cloth: | ||||
| ICON_DRAW(ICON_MOD_CLOTH); | ICON_DRAW(ICON_MOD_CLOTH); | ||||
| break; | break; | ||||
| case eModifierType_Explode: | case eModifierType_Explode: | ||||
| ICON_DRAW(ICON_MOD_EXPLODE); | ICON_DRAW(ICON_MOD_EXPLODE); | ||||
| break; | break; | ||||
| case eModifierType_Collision: | case eModifierType_Collision: | ||||
| case eModifierType_Surface: | case eModifierType_Surface: | ||||
| ICON_DRAW(ICON_MOD_PHYSICS); | ICON_DRAW(ICON_MOD_PHYSICS); | ||||
| break; | break; | ||||
| case eModifierType_Fluidsim: | case eModifierType_Fluidsim: | ||||
| ICON_DRAW(ICON_MOD_FLUIDSIM); | ICON_DRAW(ICON_MOD_FLUIDSIM); | ||||
| break; | break; | ||||
| case eModifierType_Multires: | case eModifierType_Multires: | ||||
| ICON_DRAW(ICON_MOD_MULTIRES); | ICON_DRAW(ICON_MOD_MULTIRES); | ||||
| break; | break; | ||||
| case eModifierType_Smoke: | case eModifierType_Smoke: | ||||
| ICON_DRAW(ICON_MOD_SMOKE); | ICON_DRAW(ICON_MOD_SMOKE); | ||||
| break; | break; | ||||
| case eModifierType_Solidify: | case eModifierType_Solidify: | ||||
| ICON_DRAW(ICON_MOD_SOLIDIFY); | ICON_DRAW(ICON_MOD_SOLIDIFY); | ||||
| break; | break; | ||||
| case eModifierType_Screw: | case eModifierType_Screw: | ||||
| ICON_DRAW(ICON_MOD_SCREW); | ICON_DRAW(ICON_MOD_SCREW); | ||||
| break; | break; | ||||
| case eModifierType_Remesh: | case eModifierType_Remesh: | ||||
| ICON_DRAW(ICON_MOD_REMESH); | ICON_DRAW(ICON_MOD_REMESH); | ||||
| break; | break; | ||||
| case eModifierType_WeightVGEdit: | case eModifierType_WeightVGEdit: | ||||
| case eModifierType_WeightVGMix: | case eModifierType_WeightVGMix: | ||||
| case eModifierType_WeightVGProximity: | case eModifierType_WeightVGProximity: | ||||
| ICON_DRAW(ICON_MOD_VERTEX_WEIGHT); | ICON_DRAW(ICON_MOD_VERTEX_WEIGHT); | ||||
| break; | break; | ||||
| case eModifierType_DynamicPaint: | case eModifierType_DynamicPaint: | ||||
| ICON_DRAW(ICON_MOD_DYNAMICPAINT); | ICON_DRAW(ICON_MOD_DYNAMICPAINT); | ||||
| break; | break; | ||||
| case eModifierType_Ocean: | case eModifierType_Ocean: | ||||
| ICON_DRAW(ICON_MOD_OCEAN); | ICON_DRAW(ICON_MOD_OCEAN); | ||||
| break; | break; | ||||
| case eModifierType_Warp: | case eModifierType_Warp: | ||||
| ICON_DRAW(ICON_MOD_WARP); | ICON_DRAW(ICON_MOD_WARP); | ||||
| break; | break; | ||||
| case eModifierType_Skin: | case eModifierType_Skin: | ||||
| ICON_DRAW(ICON_MOD_SKIN); | ICON_DRAW(ICON_MOD_SKIN); | ||||
| break; | break; | ||||
| case eModifierType_Triangulate: | case eModifierType_Triangulate: | ||||
| ICON_DRAW(ICON_MOD_TRIANGULATE); | ICON_DRAW(ICON_MOD_TRIANGULATE); | ||||
| break; | break; | ||||
| case eModifierType_MeshCache: | case eModifierType_MeshCache: | ||||
| ICON_DRAW(ICON_MOD_MESHDEFORM); /* XXX, needs own icon */ | ICON_DRAW(ICON_MOD_MESHDEFORM); /* XXX, needs own icon */ | ||||
| break; | break; | ||||
| case eModifierType_MeshSequenceCache: | case eModifierType_MeshSequenceCache: | ||||
| ICON_DRAW(ICON_MOD_MESHDEFORM); /* XXX, needs own icon */ | ICON_DRAW(ICON_MOD_MESHDEFORM); /* XXX, needs own icon */ | ||||
| break; | break; | ||||
| case eModifierType_Wireframe: | case eModifierType_Wireframe: | ||||
| ICON_DRAW(ICON_MOD_WIREFRAME); | ICON_DRAW(ICON_MOD_WIREFRAME); | ||||
| break; | break; | ||||
| case eModifierType_LaplacianDeform: | case eModifierType_LaplacianDeform: | ||||
| ICON_DRAW(ICON_MOD_MESHDEFORM); /* XXX, needs own icon */ | ICON_DRAW(ICON_MOD_MESHDEFORM); /* XXX, needs own icon */ | ||||
| break; | break; | ||||
| case eModifierType_DataTransfer: | case eModifierType_DataTransfer: | ||||
| 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 */ | |||||
| case eModifierType_None: | |||||
| case eModifierType_ShapeKey: | |||||
| /* GPencil Modifiers */ | case NUM_MODIFIER_TYPES: | ||||
| case eModifierType_Gpencil_Noise: | ICON_DRAW(ICON_DOT); | ||||
| break; | |||||
| } | |||||
| } | |||||
| else { | |||||
| /* grease pencil modifiers */ | |||||
| GpencilModifierData *md = BLI_findlink(&ob->greasepencil_modifiers, tselem->nr); | |||||
| switch ((GpencilModifierType)md->type) { | |||||
| case eGpencilModifierType_Noise: | |||||
| ICON_DRAW(ICON_RNDCURVE); | ICON_DRAW(ICON_RNDCURVE); | ||||
| break; | break; | ||||
| case eModifierType_Gpencil_Subdiv: | case eGpencilModifierType_Subdiv: | ||||
| ICON_DRAW(ICON_MOD_SUBSURF); | ICON_DRAW(ICON_MOD_SUBSURF); | ||||
| break; | break; | ||||
| case eModifierType_Gpencil_Thick: | case eGpencilModifierType_Thick: | ||||
| ICON_DRAW(ICON_MAN_ROT); | ICON_DRAW(ICON_MAN_ROT); | ||||
| break; | break; | ||||
| case eModifierType_Gpencil_Tint: | case eGpencilModifierType_Tint: | ||||
| ICON_DRAW(ICON_COLOR); | ICON_DRAW(ICON_COLOR); | ||||
| break; | break; | ||||
| case eModifierType_Gpencil_Instance: | case eGpencilModifierType_Instance: | ||||
| ICON_DRAW(ICON_MOD_ARRAY); | ICON_DRAW(ICON_MOD_ARRAY); | ||||
| break; | break; | ||||
| case eModifierType_Gpencil_Build: | case eGpencilModifierType_Build: | ||||
| ICON_DRAW(ICON_MOD_BUILD); | ICON_DRAW(ICON_MOD_BUILD); | ||||
| break; | break; | ||||
| case eModifierType_Gpencil_Opacity: | case eGpencilModifierType_Opacity: | ||||
| ICON_DRAW(ICON_MOD_MASK); | ICON_DRAW(ICON_MOD_MASK); | ||||
| break; | break; | ||||
| case eModifierType_Gpencil_Color: | case eGpencilModifierType_Color: | ||||
| ICON_DRAW(ICON_GROUP_VCOL); | ICON_DRAW(ICON_GROUP_VCOL); | ||||
| break; | break; | ||||
| case eModifierType_Gpencil_Lattice: | case eGpencilModifierType_Lattice: | ||||
| ICON_DRAW(ICON_MOD_LATTICE); | ICON_DRAW(ICON_MOD_LATTICE); | ||||
| break; | break; | ||||
| case eModifierType_Gpencil_Simplify: | case eGpencilModifierType_Simplify: | ||||
| ICON_DRAW(ICON_MOD_DECIM); | ICON_DRAW(ICON_MOD_DECIM); | ||||
| break; | break; | ||||
| case eModifierType_Gpencil_Smooth: | case eGpencilModifierType_Smooth: | ||||
| ICON_DRAW(ICON_MOD_SMOOTH); | ICON_DRAW(ICON_MOD_SMOOTH); | ||||
| break; | break; | ||||
| case eModifierType_Gpencil_Hook: | case eGpencilModifierType_Hook: | ||||
| ICON_DRAW(ICON_HOOK); | ICON_DRAW(ICON_HOOK); | ||||
| break; | break; | ||||
| case eModifierType_Gpencil_Offset: | case eGpencilModifierType_Offset: | ||||
| ICON_DRAW(ICON_MOD_DISPLACE); | ICON_DRAW(ICON_MOD_DISPLACE); | ||||
| break; | break; | ||||
| /* Default */ | /* Default */ | ||||
| case eModifierType_None: | default: | ||||
| case eModifierType_ShapeKey: | |||||
| 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); | ||||
| break; | break; | ||||
| case TSE_POSE_CHANNEL: | case TSE_POSE_CHANNEL: | ||||
| ICON_DRAW(ICON_BONE_DATA); | ICON_DRAW(ICON_BONE_DATA); | ||||
| break; | break; | ||||
| ▲ Show 20 Lines • Show All 972 Lines • Show Last 20 Lines | |||||
I'd probably have put the GP cases first (since GP ones are the exception here), but either way it's fine.