[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11184] trunk/blender/source/blender/src: Bother...
Joshua Leung
aligorith at gmail.com
Fri Jul 6 12:43:18 CEST 2007
Revision: 11184
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11184
Author: aligorith
Date: 2007-07-06 12:43:17 +0200 (Fri, 06 Jul 2007)
Log Message:
-----------
Bother... previous commit still didn't solve the problem.
Modified Paths:
--------------
trunk/blender/source/blender/src/drawaction.c
trunk/blender/source/blender/src/editaction.c
Modified: trunk/blender/source/blender/src/drawaction.c
===================================================================
--- trunk/blender/source/blender/src/drawaction.c 2007-07-06 09:59:18 UTC (rev 11183)
+++ trunk/blender/source/blender/src/drawaction.c 2007-07-06 10:43:17 UTC (rev 11184)
@@ -100,7 +100,7 @@
{
int i;
char str[64];
- float x, y;
+ float x, y;
uiBlock *block;
uiBut *but;
@@ -119,7 +119,7 @@
block= uiNewBlock (&curarea->uiblocks, str, UI_EMBOSS, UI_HELV, curarea->win);
x = NAMEWIDTH + 1;
- y = CHANNELHEIGHT/2;
+ y = 0.0f;
/* make the little 'open the sliders' widget */
// should eventually be removed
@@ -282,7 +282,7 @@
UI_EMBOSS, UI_HELV, curarea->win);
x = NAMEWIDTH + 1;
- y = 0.0;
+ y = 0.0f;
uiBlockSetEmboss(block, UI_EMBOSSN);
Modified: trunk/blender/source/blender/src/editaction.c
===================================================================
--- trunk/blender/source/blender/src/editaction.c 2007-07-06 09:59:18 UTC (rev 11183)
+++ trunk/blender/source/blender/src/editaction.c 2007-07-06 10:43:17 UTC (rev 11184)
@@ -645,7 +645,6 @@
break;
if (clickmin <= 0) {
/* found match */
- *ret_type= ale->type;
/* make list of keyframes */
if (ale->key_data) {
@@ -678,9 +677,15 @@
*selx= ((xmax+xmin) / 2);
/* figure out what to return */
- if (datatype == ACTCONT_ACTION)
+ if (datatype == ACTCONT_ACTION) {
*par= ale->owner; /* assume that this is an action channel */
- data = ale->data;
+ *ret_type= ale->type;
+ data = ale->data;
+ }
+ else if (datatype == ACTCONT_SHAPEKEY) {
+ data = ale->key_data;
+ *ret_type= ACTTYPE_ICU;
+ }
/* cleanup tempolary lists */
BLI_freelistN(&act_keys);
More information about the Bf-blender-cvs
mailing list