[Bf-blender-cvs] [3b0a2fecfc7] soc-2019-openxr: Fix missing return value... how did this work even?

Julian Eisel noreply at git.blender.org
Sun Jun 16 23:13:35 CEST 2019


Commit: 3b0a2fecfc7c88fac6077b54d514326e87819d61
Author: Julian Eisel
Date:   Sun Jun 16 23:08:57 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rB3b0a2fecfc7c88fac6077b54d514326e87819d61

Fix missing return value... how did this work even?

Looking at the code this should've failed miserably. No idea how this
could still work fine... Maybe return vars used same stack location?

===================================================================

M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/windowmanager/intern/wm_window.c

===================================================================

diff --git a/release/scripts/addons b/release/scripts/addons
index dccf8a462cc..a5a236df5f6 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit dccf8a462ccf10141149dc35416fc27c93abac3a
+Subproject commit a5a236df5f6630ea17958e3006070ef609c6a4b8
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 28af3c079ef..5781362d811 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 28af3c079ef39175eed36c435bd1b9e4c401c3e6
+Subproject commit 5781362d811bb4a99bee4e38a9d3a69813a8dd04
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 7a30631fdeb..0a999e17a9e 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -835,11 +835,11 @@ static wmWindow *wm_window_open_ex(bContext *C,
 
 wmWindow *WM_window_open(bContext *C, const rcti *rect)
 {
-  wm_window_open_ex(C, rect, GHOST_kDrawingContextTypeOpenGL);
+  return wm_window_open_ex(C, rect, GHOST_kDrawingContextTypeOpenGL);
 }
 wmWindow *WM_window_open_directx(bContext *C, const rcti *rect)
 {
-  wm_window_open_ex(C, rect, GHOST_kDrawingContextTypeD3D);
+  return wm_window_open_ex(C, rect, GHOST_kDrawingContextTypeD3D);
 }
 
 /**



More information about the Bf-blender-cvs mailing list