[Bf-blender-cvs] [a49f2635174] temp-T97352-3d-texturing-seam-bleeding-b2: Merge branch 'master' into temp-T97352-3d-texturing-seam-bleeding-b2
Jeroen Bakker
noreply at git.blender.org
Tue Sep 20 10:41:50 CEST 2022
Commit: a49f2635174f492fc1674f11237ab18f989dba8a
Author: Jeroen Bakker
Date: Tue Sep 20 10:38:39 2022 +0200
Branches: temp-T97352-3d-texturing-seam-bleeding-b2
https://developer.blender.org/rBa49f2635174f492fc1674f11237ab18f989dba8a
Merge branch 'master' into temp-T97352-3d-texturing-seam-bleeding-b2
===================================================================
===================================================================
diff --cc intern/ghost/GHOST_Types.h
index b3799c53a8d,80a71bb7dfe..397b01747bb
--- a/intern/ghost/GHOST_Types.h
+++ b/intern/ghost/GHOST_Types.h
@@@ -405,23 -406,27 +406,27 @@@ typedef enum
GHOST_kKeyMediaLast
} GHOST_TKey;
- #define GHOST_KEY_IS_MODIFIER(key) (key >= GHOST_kKeyLeftShift && key <= GHOST_kKeyRightOS);
-#define GHOST_KEY_MODIFIER_NUM ((_GHOST_KEY_MODIFIER_MAX - _GHOST_KEY_MODIFIER_MIN) + 1)
-#define GHOST_KEY_MODIFIER_TO_INDEX(key) ((unsigned int)(key)-_GHOST_KEY_MODIFIER_MIN)
-#define GHOST_KEY_MODIFIER_FROM_INDEX(key) \
- (GHOST_TKey)(((unsigned int)(key) + _GHOST_KEY_MODIFIER_MIN))
-#define GHOST_KEY_MODIFIER_CHECK(key) (GHOST_KEY_MODIFIER_TO_INDEX(key) < GHOST_KEY_MODIFIER_NUM)
--
--typedef enum {
-- /** Grab not set. */
-- GHOST_kGrabDisable = 0,
-- /** No cursor adjustments. */
-- GHOST_kGrabNormal,
-- /** Wrap the mouse location to prevent limiting screen bounds. */
-- GHOST_kGrabWrap,
-- /**
-- * Hide the mouse while grabbing and restore the original location on release
-- * (used for number buttons and some other draggable UI elements).
-- */
-- GHOST_kGrabHide,
--} GHOST_TGrabCursorMode;
--
--#define GHOST_GRAB_NEEDS_SOFTWARE_CURSOR_FOR_WARP(grab) ((grab) == GHOST_kGrabWrap)
++# define GHOST_KEY_MODIFIER_NUM ((_GHOST_KEY_MODIFIER_MAX - _GHOST_KEY_MODIFIER_MIN) + 1)
++# define GHOST_KEY_MODIFIER_TO_INDEX(key) ((unsigned int)(key)-_GHOST_KEY_MODIFIER_MIN)
++# define GHOST_KEY_MODIFIER_FROM_INDEX(key) \
++ (GHOST_TKey)(((unsigned int)(key) + _GHOST_KEY_MODIFIER_MIN))
++# define GHOST_KEY_MODIFIER_CHECK(key) (GHOST_KEY_MODIFIER_TO_INDEX(key) < GHOST_KEY_MODIFIER_NUM)
++
++ typedef enum {
++ /** Grab not set. */
++ GHOST_kGrabDisable = 0,
++ /** No cursor adjustments. */
++ GHOST_kGrabNormal,
++ /** Wrap the mouse location to prevent limiting screen bounds. */
++ GHOST_kGrabWrap,
++ /**
++ * Hide the mouse while grabbing and restore the original location on release
++ * (used for number buttons and some other draggable UI elements).
++ */
++ GHOST_kGrabHide,
++ } GHOST_TGrabCursorMode;
++
++# define GHOST_GRAB_NEEDS_SOFTWARE_CURSOR_FOR_WARP(grab) ((grab) == GHOST_kGrabWrap)
typedef enum {
/** Axis that cursor grab will wrap. */
@@@ -522,7 -527,7 +527,7 @@@ typedef enum
GHOST_kFinished
} GHOST_TProgress;
--#ifdef WITH_INPUT_NDOF
++# ifdef WITH_INPUT_NDOF
typedef struct {
/** N-degree of freedom device data v3 [GSoC 2010] */
/* Each component normally ranges from -1 to +1, but can exceed that.
@@@ -547,7 -552,7 +552,7 @@@ typedef struct
GHOST_TButtonAction action;
short button;
} GHOST_TEventNDOFButtonData;
--#endif // WITH_INPUT_NDOF
++# endif // WITH_INPUT_NDOF
typedef struct {
/** The key code. */
@@@ -597,30 -602,30 +602,30 @@@ typedef struct
int flags;
} GHOST_Debug;
--#ifdef _WIN32
++# ifdef _WIN32
typedef void *GHOST_TEmbedderWindowID;
--#endif // _WIN32
++# endif // _WIN32
--#ifndef _WIN32
++# ifndef _WIN32
/* I can't use "Window" from `X11/Xlib.h`
* because it conflicts with Window defined in `winlay.h`. */
typedef int GHOST_TEmbedderWindowID;
--#endif // _WIN32
++# endif // _WIN32
/**
* A timer task callback routine.
* \param task: The timer task object.
* \param time: Time since this timer started (in milliseconds).
*/
--#ifdef __cplusplus
++# ifdef __cplusplus
class GHOST_ITimerTask;
typedef void (*GHOST_TimerProcPtr)(GHOST_ITimerTask *task, uint64_t time);
--#else
++# else
struct GHOST_TimerTaskHandle__;
typedef void (*GHOST_TimerProcPtr)(struct GHOST_TimerTaskHandle__ *task, uint64_t time);
--#endif
++# endif
--#ifdef WITH_XR_OPENXR
++# ifdef WITH_XR_OPENXR
struct GHOST_XrDrawViewInfo;
struct GHOST_XrError;
@@@ -634,9 -639,9 +639,9 @@@
typedef enum GHOST_TXrGraphicsBinding {
GHOST_kXrGraphicsUnknown = 0,
GHOST_kXrGraphicsOpenGL,
--# ifdef WIN32
++# ifdef WIN32
GHOST_kXrGraphicsD3D11,
--# endif
++# endif
/* For later */
// GHOST_kXrGraphicsVulkan,
} GHOST_TXrGraphicsBinding;
@@@ -666,11 -671,11 +671,11 @@@ typedef struct
enum {
GHOST_kXrContextDebug = (1 << 0),
GHOST_kXrContextDebugTime = (1 << 1),
--# ifdef WIN32
++# ifdef WIN32
/* Needed to avoid issues with the SteamVR OpenGL graphics binding
* (use DirectX fallback instead). */
GHOST_kXrContextGpuNVIDIA = (1 << 2),
--# endif
++# endif
};
typedef struct {
@@@ -794,4 -799,4 +799,4 @@@ typedef struct GHOST_XrControllerModelD
const GHOST_XrControllerModelComponent *components;
} GHOST_XrControllerModelData;
--#endif /* WITH_XR_OPENXR */
++# endif /* WITH_XR_OPENXR */
diff --cc intern/ghost/intern/GHOST_SystemWin32.cpp
index 5a40feb70ae,5c58f9a856c..3ea1ad903e5
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@@ -1147,7 -1147,7 +1147,11 @@@ GHOST_EventKey *GHOST_SystemWin32::proc
if (key_down) {
if (system->m_keycode_last_repeat_key == vk) {
is_repeat = true;
++<<<<<<< HEAD
+ is_repeated_modifier = GHOST_KEY_IS_MODIFIER(key);
++=======
+ is_repeated_modifier = GHOST_KEY_MODIFIER_CHECK(key);
++>>>>>>> master
}
system->m_keycode_last_repeat_key = vk;
}
diff --cc source/blender/blenkernel/BKE_geometry_set.hh
index dce80373189,2ef9556afc7..78de9ef9ffe
--- a/source/blender/blenkernel/BKE_geometry_set.hh
+++ b/source/blender/blenkernel/BKE_geometry_set.hh
@@@ -464,7 -464,7 +464,11 @@@ class PointCloudComponent : public Geom
};
/**
++<<<<<<< HEAD
+ * A geometry component that stores a group of curves, corresponding the #Curves data-block type
++=======
+ * A geometry component that stores a group of curves, corresponding the #Curves data-block
++>>>>>>> master
* and the #CurvesGeometry type. Attributes are stored on the control point domain and the
* curve domain.
*/
More information about the Bf-blender-cvs
mailing list