diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-07-31 04:42:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-07-31 04:42:10 +0400 |
| commit | c371f49d9aaf2c9eca90329954fe217efb5cf3f6 (patch) | |
| tree | 142b9cb20d8b963f0cfd8a8fd4ee6437a47dafc4 /source/blender/editors/space_logic | |
| parent | b55e996874c8b9a12b4a2a50f9d1993b5f921c57 (diff) | |
| parent | 7301f33b26ccae263d0bfdde5f82d98a70790fd5 (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r21908:22075
Diffstat (limited to 'source/blender/editors/space_logic')
| -rw-r--r-- | source/blender/editors/space_logic/logic_window.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index 03b4a2b84f4..274f5f47e43 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -2134,7 +2134,10 @@ static short draw_actuatorbuttons(Object *ob, bActuator *act, uiBlock *block, sh glRects(xco, yco-ysize, xco+width, yco); uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1); - uiDefIDPoinBut(block, test_meshpoin_but, ID_ME, 1, "ME:", xco+40, yco-44, (width-80), 19, &(eoa->me), "replace the existing mesh with this one"); + uiDefIDPoinBut(block, test_meshpoin_but, ID_ME, 1, "ME:", xco+40, yco-44, (width-80)/2, 19, &(eoa->me), "replace the existing, when left blank 'Phys' will remake the existing physics mesh"); + + uiDefButBitS(block, TOGN, ACT_EDOB_REPLACE_MESH_NOGFX, 0, "Gfx", xco+40 + (width-80)/2, yco-44, (width-80)/4, 19, &eoa->flag, 0, 0, 0, 0, "Replace the display mesh"); + uiDefButBitS(block, TOG, ACT_EDOB_REPLACE_MESH_PHYS, 0, "Phys", xco+40 + (width-80)/2 +(width-80)/4, yco-44, (width-80)/4, 19, &eoa->flag, 0, 0, 0, 0, "Replace the physics mesh (triangle bounds only. compound shapes not supported)"); } else if(eoa->type==ACT_EDOB_TRACK_TO) { ysize= 48; |