[Bf-blender-cvs] [7c9e18c1933] soc-2019-openxr: Cleanup: Add comments

Julian Eisel noreply at git.blender.org
Fri Aug 23 17:19:57 CEST 2019


Commit: 7c9e18c19334fbba0763994e17fe68c3ee61980a
Author: Julian Eisel
Date:   Fri Aug 23 17:00:30 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rB7c9e18c19334fbba0763994e17fe68c3ee61980a

Cleanup: Add comments

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

M	build_files/cmake/Modules/presentation.cmake
M	build_files/cmake/Modules/xr_platform_defines.cmake
M	source/blender/windowmanager/intern/wm_operators.c

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

diff --git a/build_files/cmake/Modules/presentation.cmake b/build_files/cmake/Modules/presentation.cmake
index 1abcc0e66f7..5d0b544422e 100644
--- a/build_files/cmake/Modules/presentation.cmake
+++ b/build_files/cmake/Modules/presentation.cmake
@@ -1,3 +1,17 @@
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Copied right from the OpenXR-SDK (src/cmake/presentation.cmake).
+# Don't forget to add the license header above.
+
 set(PRESENTATION_BACKENDS xlib xcb wayland)
 set(PRESENTATION_BACKEND xlib CACHE STRING
     "Presentation backend chosen at configure time")
diff --git a/build_files/cmake/Modules/xr_platform_defines.cmake b/build_files/cmake/Modules/xr_platform_defines.cmake
index cb1740a993d..4c41b280c35 100644
--- a/build_files/cmake/Modules/xr_platform_defines.cmake
+++ b/build_files/cmake/Modules/xr_platform_defines.cmake
@@ -12,6 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# These defines are required as per the OpenXR specification. We can
+# just take them from the OpenXR-SDK's src/CMakeLists.txt. Not all of
+# them are needed (e.g. XCB and Wayland), but we just copy them anyway.
 
 if(WIN32)
   add_definitions(-DXR_OS_WINDOWS)
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 9d46b37c0d7..36d58faacb8 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -3354,6 +3354,8 @@ static void WM_OT_xr_session_toggle(wmOperatorType *ot)
   /* callbacks */
   ot->exec = wm_xr_session_toggle_exec;
 
+  /* XXX INTERNAL just to hide it from the search menu by default, an Add-on will expose it in the
+   * UI instead. Not meant as a permanent solution. */
   ot->flag = OPTYPE_INTERNAL;
 }
 #endif /* WITH_OPENXR */



More information about the Bf-blender-cvs mailing list