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:
authorAntony Riakiotakis <kalast@gmail.com>2015-07-19 19:04:21 +0300
committerAntony Riakiotakis <kalast@gmail.com>2015-07-19 19:04:21 +0300
commit8f1c1ef3a9f310db7f28806a2a441e32f5b56f97 (patch)
tree41d8dcfcc28ed5b4e8dae14674e9713215353195 /source/blender/windowmanager
parentd712dc5a1d1ed451814f585bc7a574931e9f4b47 (diff)
Fix T45477 wrong edge selection.
Caused by own changes to framebuffer selection code, code was not packing color ids correctly.
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/intern/wm_subwindow.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_subwindow.c b/source/blender/windowmanager/intern/wm_subwindow.c
index 6b286bd19a5..94fe2a662b1 100644
--- a/source/blender/windowmanager/intern/wm_subwindow.c
+++ b/source/blender/windowmanager/intern/wm_subwindow.c
@@ -461,7 +461,11 @@ void WM_framebuffer_index_set(int index)
void WM_framebuffer_index_get(int index, int *r_col)
{
- *r_col = index_to_framebuffer(index);
+ const int col = index_to_framebuffer(index);
+ *r_col = ((col & 0xFF) << 24) | /* red */
+ (((col >> 8) & 0xFF) << 16) | /* green */
+ (((col >> 16) & 0xFF) << 8) | /* blue */
+ 0xFF; /* alpha */
}