diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-10-23 16:33:11 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-23 16:33:11 +0400 |
commit | 094ab4af034a94402a73c2f661dde600cd3ee334 (patch) | |
tree | ef142e8f0d16ffd384d17fa32dcb2b48877fcb1d /source/blender/makesrna/intern/rna_wm.c | |
parent | dc907ef876b128c9767394d00dfc719d55ba077e (diff) | |
parent | 4ea8cb25295d0e61a1fcf1cd16028a3586ed5921 (diff) |
Merge fixes from trunk into 2.60a tag:v2.60a
svn merge ^/trunk/blender \
-c41113 \
-c41117 \
-c41128 \
-c41132 \
-c41134 \
-c41151 \
-c41152 \
-c41175 \
-c41197 \
-c41203 \
-c41211 \
-c41214 \
-c41219
Diffstat (limited to 'source/blender/makesrna/intern/rna_wm.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_wm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index e9df79acd4a..fa6fb73ea8e 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -460,14 +460,14 @@ static PointerRNA rna_OperatorMacro_properties_get(PointerRNA *ptr) static void rna_Event_ascii_get(PointerRNA *ptr, char *value) { - wmEvent *event= (wmEvent*)ptr->id.data; + wmEvent *event= (wmEvent*)ptr->data; value[0]= event->ascii; value[1]= '\0'; } static int rna_Event_ascii_length(PointerRNA *ptr) { - wmEvent *event= (wmEvent*)ptr->id.data; + wmEvent *event= (wmEvent*)ptr->data; return (event->ascii)? 1 : 0; } |