Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2008-05-10 17:09:34 +0400
committerCampbell Barton <ideasman42@gmail.com>2008-05-10 17:09:34 +0400
commita404e4aead2ed61ab0854a15f1bb5a392513c4a6 (patch)
treec491967babd1754e752cdd8ea1b5edaeab9af4a9 /source/blender/src/buttons_object.c
parent3870080d3f22a7ecf93d67bfb2ea3d155bd9e009 (diff)
added access to object alpha since there is alredy ipo access
Diffstat (limited to 'source/blender/src/buttons_object.c')
-rw-r--r--source/blender/src/buttons_object.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c
index 919187a4abe..8fcd55fd6f9 100644
--- a/source/blender/src/buttons_object.c
+++ b/source/blender/src/buttons_object.c
@@ -2730,7 +2730,7 @@ static void object_panel_draw(Object *ob)
uiSetButLock(object_is_libdata(ob), ERROR_LIBDATA_MESSAGE);
/* LAYERS */
- xco= 80;
+ xco= 65;
dx= 35;
dy= 30;
@@ -2752,7 +2752,10 @@ static void object_panel_draw(Object *ob)
uiBlockEndAlign(block);
/* Object Color */
- uiDefButF(block, COL, REDRAWVIEW3D, "", 270, 165,30, 30, ob->col, 0, 0, 0, 0, "Object color, used when faces have the ObCol mode enabled");
+ uiBlockBeginAlign(block);
+ uiDefButF(block, COL, REDRAWVIEW3D, "", 250, 180, 50, 15, ob->col, 0, 0, 0, 0, "Object color, used when faces have the ObCol mode enabled");
+ uiDefButF(block, NUM, REDRAWVIEW3D, "A:", 250, 165, 50, 15, &ob->col[3], 0.0f, 1.0f, 10, 2, "Object alpha, used when faces have the ObCol mode enabled");
+ uiBlockEndAlign(block);
uiDefBut(block, LABEL, 0, "Drawtype", 10,120,100,20, NULL, 0, 0, 0, 0, "");