Chris_Blackbourn/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests 1 Activity

WIP: uv-simple-select #1

Closed
Chris Blackbourn wants to merge 182 commits from uv-simple-select into main
pull from: uv-simple-select
merge into: Chris_Blackbourn:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 182 Files Changed 881 +45 -17
13 changed files with 45 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 42d838ca07 - Show all commits

1
CMakeLists.txt
View File

@ -1631,6 +1631,7 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC")
# warning level: # warning level:
"/W3" "/W3"
"/w34062" # switch statement contains 'default' but no 'case' labels "/w34062" # switch statement contains 'default' but no 'case' labels
"/w34100" # 'identifier' : unreferenced formal parameter
"/w34115" # 'type' : named type definition in parentheses "/w34115" # 'type' : named type definition in parentheses
"/w34189" # local variable is initialized but not referenced "/w34189" # local variable is initialized but not referenced
# see https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/c5038?view=vs-2017 # see https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/c5038?view=vs-2017

3
build_files/cmake/macros.cmake
View File

@ -702,6 +702,7 @@ macro(remove_strict_flags)
endif() endif()
if(MSVC) if(MSVC)
remove_cc_flag(/w34100) # Restore warn C4100 (unreferenced formal parameter) back to w4
remove_cc_flag(/w34189) # Restore warn C4189 (unused variable) back to w4 remove_cc_flag(/w34189) # Restore warn C4189 (unused variable) back to w4
endif() endif()
@ -721,7 +722,7 @@ macro(remove_extra_strict_flags)
endif() endif()
if(MSVC) if(MSVC)
# TODO remove_cc_flag(/w34100) # Restore warn C4100 (unreferenced formal parameter) back to w4
endif() endif()
endmacro() endmacro()

6
intern/ghost/intern/GHOST_DropTargetWin32.cpp
View File

@ -78,7 +78,7 @@ ULONG __stdcall GHOST_DropTargetWin32::Release(void)
* Implementation of IDropTarget::DragEnter * Implementation of IDropTarget::DragEnter
*/ */
HRESULT __stdcall GHOST_DropTargetWin32::DragEnter(IDataObject *p_data_object, HRESULT __stdcall GHOST_DropTargetWin32::DragEnter(IDataObject *p_data_object,
DWORD grf_key_state, DWORD /*grf_key_state*/,
POINTL pt, POINTL pt,
DWORD *pdw_effect) DWORD *pdw_effect)
{ {
@ -95,7 +95,7 @@ HRESULT __stdcall GHOST_DropTargetWin32::DragEnter(IDataObject *p_data_object,
/* /*
* Implementation of IDropTarget::DragOver * Implementation of IDropTarget::DragOver
*/ */
HRESULT __stdcall GHOST_DropTargetWin32::DragOver(DWORD grf_key_state, HRESULT __stdcall GHOST_DropTargetWin32::DragOver(DWORD /*grf_key_state*/,
POINTL pt, POINTL pt,
DWORD *pdw_effect) DWORD *pdw_effect)
{ {
@ -128,7 +128,7 @@ HRESULT __stdcall GHOST_DropTargetWin32::DragLeave(void)
* the implementation of IDropTarget::DragOver * the implementation of IDropTarget::DragOver
*/ */
HRESULT __stdcall GHOST_DropTargetWin32::Drop(IDataObject *p_data_object, HRESULT __stdcall GHOST_DropTargetWin32::Drop(IDataObject *p_data_object,
DWORD grf_key_state, DWORD /*grf_key_state*/,
POINTL pt, POINTL pt,
DWORD *pdw_effect) DWORD *pdw_effect)
{ {

6
intern/ghost/intern/GHOST_ImeWin32.cpp
View File

@ -140,7 +140,7 @@ void GHOST_ImeWin32::SetImeWindowStyle(
::DefWindowProc(window_handle, message, wparam, lparam); ::DefWindowProc(window_handle, message, wparam, lparam);
} }
void GHOST_ImeWin32::DestroyImeWindow(HWND window_handle) void GHOST_ImeWin32::DestroyImeWindow(HWND /*window_handle*/)
{ {
/* Destroy the system caret if we have created for this IME input context. */ /* Destroy the system caret if we have created for this IME input context. */
if (system_caret_) { if (system_caret_) {
@ -149,7 +149,7 @@ void GHOST_ImeWin32::DestroyImeWindow(HWND window_handle)
} }
} }
void GHOST_ImeWin32::MoveImeWindow(HWND window_handle, HIMC imm_context) void GHOST_ImeWin32::MoveImeWindow(HWND /*window_handle*/, HIMC imm_context)
{ {
int x = caret_rect_.m_l; int x = caret_rect_.m_l;
int y = caret_rect_.m_t; int y = caret_rect_.m_t;
@ -228,7 +228,7 @@ void GHOST_ImeWin32::CheckFirst(HWND window_handle)
} }
} }
void GHOST_ImeWin32::ResetComposition(HWND window_handle) void GHOST_ImeWin32::ResetComposition(HWND /*window_handle*/)
{ {
/* Currently, just reset the composition status. */ /* Currently, just reset the composition status. */
is_composing_ = false; is_composing_ = false;

10
intern/ghost/intern/GHOST_SystemWin32.cpp
View File

@ -217,7 +217,7 @@ GHOST_IWindow *GHOST_SystemWin32::createWindow(const char *title,
uint32_t height, uint32_t height,
GHOST_TWindowState state, GHOST_TWindowState state,
GHOST_GLSettings glSettings, GHOST_GLSettings glSettings,
const bool exclusive, const bool /*exclusive*/,
const bool is_dialog, const bool is_dialog,
const GHOST_IWindow *parentWindow) const GHOST_IWindow *parentWindow)
{ {
@ -568,7 +568,7 @@ GHOST_TKey GHOST_SystemWin32::hardKey(RAWINPUT const &raw, bool *r_key_down)
* This function was added in response to bug #25715. * This function was added in response to bug #25715.
* This is going to be a long list #42426. * This is going to be a long list #42426.
*/ */
GHOST_TKey GHOST_SystemWin32::processSpecialKey(short vKey, short scanCode) const GHOST_TKey GHOST_SystemWin32::processSpecialKey(short vKey, short /*scanCode*/) const
{ {
GHOST_TKey key = GHOST_kKeyUnknown; GHOST_TKey key = GHOST_kKeyUnknown;
if (vKey == 0xFF) { if (vKey == 0xFF) {
@ -1148,7 +1148,9 @@ GHOST_EventCursor *GHOST_SystemWin32::processCursorEvent(GHOST_WindowWin32 *wind
GHOST_TABLET_DATA_NONE); GHOST_TABLET_DATA_NONE);
} }
void GHOST_SystemWin32::processWheelEvent(GHOST_WindowWin32 *window, WPARAM wParam, LPARAM lParam) void GHOST_SystemWin32::processWheelEvent(GHOST_WindowWin32 *window,
WPARAM wParam,
LPARAM /*lParam*/)
{ {
GHOST_SystemWin32 *system = (GHOST_SystemWin32 *)getSystem(); GHOST_SystemWin32 *system = (GHOST_SystemWin32 *)getSystem();
@ -2181,7 +2183,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, uint msg, WPARAM wParam,
return lResult; return lResult;
} }
char *GHOST_SystemWin32::getClipboard(bool selection) const char *GHOST_SystemWin32::getClipboard(bool /*selection*/) const
{ {
if (IsClipboardFormatAvailable(CF_UNICODETEXT) && OpenClipboard(NULL)) { if (IsClipboardFormatAvailable(CF_UNICODETEXT) && OpenClipboard(NULL)) {
wchar_t *buffer; wchar_t *buffer;

4
intern/ghost/intern/GHOST_TrackpadWin32.cpp
View File

@ -265,14 +265,14 @@ HRESULT GHOST_DirectManipulationViewportEventHandler::OnViewportStatusChanged(
} }
HRESULT GHOST_DirectManipulationViewportEventHandler::OnViewportUpdated( HRESULT GHOST_DirectManipulationViewportEventHandler::OnViewportUpdated(
IDirectManipulationViewport *viewport) IDirectManipulationViewport * /*viewport*/)
{ {
/* Nothing to do here. */ /* Nothing to do here. */
return S_OK; return S_OK;
} }
HRESULT GHOST_DirectManipulationViewportEventHandler::OnContentUpdated( HRESULT GHOST_DirectManipulationViewportEventHandler::OnContentUpdated(
IDirectManipulationViewport *viewport, IDirectManipulationContent *content) IDirectManipulationViewport * /*viewport*/, IDirectManipulationContent *content)
{ {
float transform[6]; float transform[6];
HRESULT hr = content->GetContentTransform(transform, ARRAYSIZE(transform)); HRESULT hr = content->GetContentTransform(transform, ARRAYSIZE(transform));

13
intern/ghost/intern/GHOST_WindowWin32.cpp
View File

@ -898,7 +898,7 @@ GHOST_TSuccess GHOST_WindowWin32::hasCursorShape(GHOST_TStandardCursor cursorSha
} }
GHOST_TSuccess GHOST_WindowWin32::getPointerInfo( GHOST_TSuccess GHOST_WindowWin32::getPointerInfo(
std::vector<GHOST_PointerInfoWin32> &outPointerInfo, WPARAM wParam, LPARAM lParam) std::vector<GHOST_PointerInfoWin32> &outPointerInfo, WPARAM wParam, LPARAM /*lParam*/)
{ {
int32_t pointerId = GET_POINTERID_WPARAM(wParam); int32_t pointerId = GET_POINTERID_WPARAM(wParam);
int32_t isPrimary = IS_POINTER_PRIMARY_WPARAM(wParam); int32_t isPrimary = IS_POINTER_PRIMARY_WPARAM(wParam);
@ -1109,8 +1109,13 @@ static uint16_t uns16ReverseBits(uint16_t shrt)
} }
#endif #endif
GHOST_TSuccess GHOST_WindowWin32::setWindowCustomCursorShape( GHOST_TSuccess GHOST_WindowWin32::setWindowCustomCursorShape(uint8_t *bitmap,
uint8_t *bitmap, uint8_t *mask, int sizeX, int sizeY, int hotX, int hotY, bool canInvertColor) uint8_t *mask,
int sizeX,
int sizeY,
int hotX,
int hotY,
bool /*canInvertColor*/)
{ {
uint32_t andData[32]; uint32_t andData[32];
uint32_t xorData[32]; uint32_t xorData[32];
@ -1175,7 +1180,7 @@ GHOST_TSuccess GHOST_WindowWin32::endProgressBar()
} }
#ifdef WITH_INPUT_IME #ifdef WITH_INPUT_IME
void GHOST_WindowWin32::beginIME(int32_t x, int32_t y, int32_t w, int32_t h, bool completed) void GHOST_WindowWin32::beginIME(int32_t x, int32_t y, int32_t /*w*/, int32_t h, bool completed)
{ {
m_imeInput.BeginIME(m_hWnd, GHOST_Rect(x, y - h, x, y), completed); m_imeInput.BeginIME(m_hWnd, GHOST_Rect(x, y - h, x, y), completed);
} }

3
intern/guardedalloc/intern/mallocn_intern.h
View File

@ -10,6 +10,9 @@
#ifdef __GNUC__ #ifdef __GNUC__
# define UNUSED(x) UNUSED_##x __attribute__((__unused__)) # define UNUSED(x) UNUSED_##x __attribute__((__unused__))
#elif defined(_MSC_VER)
/* NOTE: This suppresses the warning for the line, not the attribute. */
# define UNUSED(x) UNUSED_##x __pragma(warning(suppress : 4100))
#else #else
# define UNUSED(x) UNUSED_##x # define UNUSED(x) UNUSED_##x
#endif #endif

3
source/blender/blenlib/BLI_utildefines.h
View File

@ -668,6 +668,9 @@ extern bool BLI_memory_is_zero(const void *arr, size_t arr_size);
/* UNUSED macro, for function argument */ /* UNUSED macro, for function argument */
# if defined(__GNUC__) || defined(__clang__) # if defined(__GNUC__) || defined(__clang__)
# define UNUSED(x) UNUSED_##x __attribute__((__unused__)) # define UNUSED(x) UNUSED_##x __attribute__((__unused__))
# elif defined(_MSC_VER)
/* NOTE: This suppresses the warning for the line, not the attribute. */
# define UNUSED(x) UNUSED_##x __pragma(warning(suppress : 4100))
# else # else
# define UNUSED(x) UNUSED_##x # define UNUSED(x) UNUSED_##x
# endif # endif

2
source/blender/blenlib/intern/BLI_filelist.c
View File

@ -272,6 +272,7 @@ void BLI_filelist_entry_mode_to_string(const struct stat *st,
const char *types[8] = {"---", "--x", "-w-", "-wx", "r--", "r-x", "rw-", "rwx"}; const char *types[8] = {"---", "--x", "-w-", "-wx", "r--", "r-x", "rw-", "rwx"};
#ifdef WIN32 #ifdef WIN32
UNUSED_VARS(st);
BLI_strncpy(r_mode1, types[0], sizeof(*r_mode1) * FILELIST_DIRENTRY_MODE_LEN); BLI_strncpy(r_mode1, types[0], sizeof(*r_mode1) * FILELIST_DIRENTRY_MODE_LEN);
BLI_strncpy(r_mode2, types[0], sizeof(*r_mode2) * FILELIST_DIRENTRY_MODE_LEN); BLI_strncpy(r_mode2, types[0], sizeof(*r_mode2) * FILELIST_DIRENTRY_MODE_LEN);
BLI_strncpy(r_mode3, types[0], sizeof(*r_mode3) * FILELIST_DIRENTRY_MODE_LEN); BLI_strncpy(r_mode3, types[0], sizeof(*r_mode3) * FILELIST_DIRENTRY_MODE_LEN);
@ -315,6 +316,7 @@ void BLI_filelist_entry_owner_to_string(const struct stat *st,
char r_owner[FILELIST_DIRENTRY_OWNER_LEN]) char r_owner[FILELIST_DIRENTRY_OWNER_LEN])
{ {
#ifdef WIN32 #ifdef WIN32
UNUSED_VARS(st);
strcpy(r_owner, "unknown"); strcpy(r_owner, "unknown");
#else #else
struct passwd *pwuser = getpwuid(st->st_uid); struct passwd *pwuser = getpwuid(st->st_uid);

3
source/blender/makesrna/intern/CMakeLists.txt
View File

@ -140,6 +140,9 @@ if(CMAKE_COMPILER_IS_GNUCC OR (CMAKE_C_COMPILER_ID MATCHES "Clang"))
endif() endif()
if(CMAKE_C_COMPILER_ID MATCHES "Clang") if(CMAKE_C_COMPILER_ID MATCHES "Clang")
string(APPEND GENSRC_CFLAGS " -Wno-missing-variable-declarations") string(APPEND GENSRC_CFLAGS " -Wno-missing-variable-declarations")
elseif(MSVC)
# Restore warn C4100 (unreferenced formal parameter) back to w4
remove_cc_flag(/w34100)
endif() endif()
if(GENSRC_CFLAGS) if(GENSRC_CFLAGS)

3
source/blender/python/intern/stubs.c
View File

@ -12,6 +12,9 @@
#if defined(__GNUC__) || defined(__clang__) #if defined(__GNUC__) || defined(__clang__)
# pragma GCC diagnostic error "-Wmissing-prototypes" # pragma GCC diagnostic error "-Wmissing-prototypes"
# pragma GCC diagnostic ignored "-Wunused-parameter" # pragma GCC diagnostic ignored "-Wunused-parameter"
#elif defined(_MSC_VER)
/* Suppress unreferenced formal parameter warning. */
# pragma warning(disable : 4100)
#endif #endif
/* python, will come back */ /* python, will come back */

5
source/creator/blender_launcher_win32.c
View File

@ -55,6 +55,11 @@ BOOL LaunchedFromSteam()
int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR pCmdLine, int nCmdShow) int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR pCmdLine, int nCmdShow)
{ {
/* Silence unreferenced formal parameter warning. */
(void)hInstance;
(void)hPrevInstance;
(void)nCmdShow;
STARTUPINFO siStartInfo = {0}; STARTUPINFO siStartInfo = {0};
PROCESS_INFORMATION procInfo; PROCESS_INFORMATION procInfo;
wchar_t path[MAX_PATH]; wchar_t path[MAX_PATH];