diff options
author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-08-18 18:33:26 +0400 |
---|---|---|
committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-08-18 18:33:26 +0400 |
commit | 2ce338f7e80094ad50cf1b30cc47ad6b85ae55b3 (patch) | |
tree | 5929445c89798ab71f55fcd9e64b734caf761b14 /source/blender/src/buttons_editing.c | |
parent | a88eb64f70750de50fe153c147382261867ae1be (diff) |
svn merge -r 16077:16174 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/src/buttons_editing.c')
-rw-r--r-- | source/blender/src/buttons_editing.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c index 63303467856..4682549297a 100644 --- a/source/blender/src/buttons_editing.c +++ b/source/blender/src/buttons_editing.c @@ -4277,7 +4277,7 @@ static void validate_posebonebutton_cb(void *bonev, void *namev) static void armature_layer_cb(void *lay_v, void *value_v) { short *layer= lay_v; - int value= (long)value_v; + int value= (intptr_t)value_v; if(*layer==0 || G.qual==0) *layer= value; allqueue(REDRAWBUTSEDIT, 0); |