Changeset View
Changeset View
Standalone View
Standalone View
source/blender/editors/interface/interface_icons.cc
| Show First 20 Lines • Show All 2,118 Lines • ▼ Show 20 Lines | else if (space_type == SPACE_IMAGE) { | ||||
| const SpaceImage *sima = static_cast<const SpaceImage *>(area->spacedata.first); | const SpaceImage *sima = static_cast<const SpaceImage *>(area->spacedata.first); | ||||
| if (sima->mode == SI_MODE_PAINT) { | if (sima->mode == SI_MODE_PAINT) { | ||||
| paint_mode = PAINT_MODE_TEXTURE_2D; | paint_mode = PAINT_MODE_TEXTURE_2D; | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| /* reset the icon */ | /* reset the icon */ | ||||
| if ((ob != NULL) && | if ((ob != NULL) && (ob->mode & OB_MODE_ALL_PAINT_GPENCIL) && (br->gpencil_settings != NULL)) { | ||||
| (ob->mode & (OB_MODE_PAINT_GPENCIL | OB_MODE_VERTEX_GPENCIL | OB_MODE_SCULPT_GPENCIL | | |||||
| OB_MODE_WEIGHT_GPENCIL)) && | |||||
| (br->gpencil_settings != NULL)) { | |||||
| switch (br->gpencil_settings->icon_id) { | switch (br->gpencil_settings->icon_id) { | ||||
| case GP_BRUSH_ICON_PENCIL: | case GP_BRUSH_ICON_PENCIL: | ||||
| br->id.icon_id = ICON_GPBRUSH_PENCIL; | br->id.icon_id = ICON_GPBRUSH_PENCIL; | ||||
| break; | break; | ||||
| case GP_BRUSH_ICON_PEN: | case GP_BRUSH_ICON_PEN: | ||||
| br->id.icon_id = ICON_GPBRUSH_PEN; | br->id.icon_id = ICON_GPBRUSH_PEN; | ||||
| break; | break; | ||||
| case GP_BRUSH_ICON_INK: | case GP_BRUSH_ICON_INK: | ||||
| ▲ Show 20 Lines • Show All 431 Lines • Show Last 20 Lines | |||||