diff options
| author | Ton Roosendaal <ton@blender.org> | 2004-07-27 01:32:56 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2004-07-27 01:32:56 +0400 |
| commit | 0437f23008e7b3932e4febff26abb81182811c86 (patch) | |
| tree | abf8fe83687df5feeb938b4c682d4bec05acb933 /source/blender/src/header_ipo.c | |
| parent | 3d299a5dceb43299e11ecdc14401ea411ea277fe (diff) | |
Error in new particle deflector buttons; wrong type! Doesn't anyone
check warnings, eh! :)
space.c error is mine though... warning too!
Diffstat (limited to 'source/blender/src/header_ipo.c')
| -rw-r--r-- | source/blender/src/header_ipo.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/src/header_ipo.c b/source/blender/src/header_ipo.c index a51bae9d557..812ffcdda2f 100644 --- a/source/blender/src/header_ipo.c +++ b/source/blender/src/header_ipo.c @@ -71,6 +71,7 @@ #include "BKE_global.h" #include "BKE_main.h" #include "BKE_material.h" +#include "BKE_texture.h" #include "BKE_utildefines.h" #include "BLI_blenlib.h" #include "BSE_drawipo.h" @@ -624,6 +625,11 @@ static char *ipo_modeselect_pup(void) strcat(string,tmpstr); } + if(OBACT && give_current_texture(OBACT, OBACT->actcol)) { + sprintf(tmpstr,formatstring,"Texture",ID_TE, ICON_TEXTURE); + strcat(string,tmpstr); + } + if(OBACT){ if ELEM4(OBACT->type, OB_MESH, OB_CURVE, OB_SURF, OB_LATTICE) { sprintf(tmpstr,formatstring,"Vertex",ID_KE, ICON_EDIT); @@ -858,6 +864,8 @@ void ipo_buttons(void) icon = ICON_CONSTRAINT; else if (G.sipo->blocktype == ID_SEQ) icon = ICON_SEQUENCE; + else if(G.sipo->blocktype == ID_TE) + icon = ICON_TEXTURE; uiDefIconTextButS(block, MENU, B_IPOMAIN, icon, ipo_modeselect_pup(), xco,0,100,20, &(G.sipo->blocktype), 0, 0, 0, 0, "Display IPO type"); |