Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dev with clang format #894

Merged
merged 28 commits into from
Nov 5, 2020
Merged

Merge dev with clang format #894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
9d61857
MAYA-106486 Handle UV linkage on material export
JGamache-autodesk Oct 30, 2020
24a920b
MAYA-106486 Update map1/st unit tests
JGamache-autodesk Oct 30, 2020
a946154
Issue-589: make WANT_UFE_BUILD flag public.
Sep 23, 2020
fd22a99
MAYA-107444 - Making WANT_UFE_BUILD compiler definition as PUBLIC cau…
seando-adsk Nov 2, 2020
01f50ae
MAYA-107444 - Making WANT_UFE_BUILD compiler definition as PUBLIC cau…
seando-adsk Nov 2, 2020
f99eb43
Oops forgot to remove line.
seando-adsk Nov 2, 2020
8e179b4
MAYA-107246 - USD: outliner does not update dynamically when duplicat…
seando-adsk Nov 2, 2020
094faab
fix call to non-existent function in pxrUsd plugin's usdTranslatorImport
mattyjams Nov 2, 2020
17d2cb1
MAYA-106486 UDIM Import/Export
JGamache-autodesk Nov 2, 2020
622b336
MAYA-107785 Prepare CPV buffer if requested by USD material.
Nov 3, 2020
c45e71b
Fix for Maya 2020 using UFE v1.
seando-adsk Nov 3, 2020
f36e941
Merge pull request #882 from Autodesk/chenh/MAYA-107785/build-color-b…
Nov 3, 2020
b8a93e2
Merge pull request #881 from mattyjams/pr/fix_pxrUsd_shadingModePopup…
Nov 3, 2020
87e1cfd
Merge pull request #793 from Autodesk/sabrih/make_want_ufe_build_def_…
Nov 3, 2020
8284d93
MAYA-106486 Add env var for renaming behaviour
JGamache-autodesk Nov 3, 2020
ae73ef5
MAYA-106486 Updates from review comments
JGamache-autodesk Nov 3, 2020
6c27f0a
Merge pull request #876 from Autodesk/t_gamaj/MAYA-106486/uv_linkage_…
Nov 4, 2020
9d64663
Merge pull request #883 from Autodesk/t_gamaj/MAYA-106486/udim_import…
Nov 4, 2020
b5c8986
Merge pull request #880 from Autodesk/donnels/MAYA-107246/outliner_do…
Nov 4, 2020
6919d0c
Enable initialization order warning on Windows.
ppt-adsk Nov 4, 2020
5cfeb1b
Merge pull request #885 from Autodesk/tremblp/MAYA-106088/windows_ini…
Nov 4, 2020
bb0704a
Include all mayaUsd targets in maya-usd repository category
Nov 4, 2020
0fe90bc
Merge pull request #888 from Autodesk/kxl-adsk/update_clang_format_co…
Nov 4, 2020
7c64b5d
Apply clang format
Nov 4, 2020
91994c0
Merge pull request #890 from Autodesk/kxl-adsk/apply_clang_format_for…
Nov 5, 2020
0d0983b
Merge commit '0fe90bcce893dfbd4422f70bda84435f5721dd43' into kxl-adsk…
Nov 5, 2020
2487c4a
Merge commit '7c64b5df1f1cdbf879aaef12ed64b7fdd77a3af1' into kxl-adsk…
Nov 5, 2020
6a7548c
Merge remote-tracking branch 'origin/dev' into kxl-adsk/merge_dev_wit…
Nov 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ IncludeCategories:
# Priority 0

# 3. All public headers from this repository (maya-usd)
- Regex: '^<(mayaUsd|hdMaya|AL|usdMaya)/'
- Regex: '^<(mayaUsd.*|hdMaya|AL|usdMaya)/'
Priority: 3

# 4. Pixar + USD headers
Expand Down
2 changes: 1 addition & 1 deletion lib/mayaUsd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ target_compile_definitions(${PROJECT_NAME}
$<$<STREQUAL:${CMAKE_BUILD_TYPE},Debug>:TBB_USE_DEBUG>
$<$<STREQUAL:${CMAKE_BUILD_TYPE},Debug>:BOOST_DEBUG_PYTHON>
$<$<STREQUAL:${CMAKE_BUILD_TYPE},Debug>:BOOST_LINKING_PYTHON>
$<$<BOOL:${UFE_FOUND}>:WANT_UFE_BUILD>
PRIVATE
MAYAUSD_MACROS_EXPORT
MAYAUSD_CORE_EXPORT
MFB_PACKAGE_NAME="${PROJECT_NAME}"
MFB_ALT_PACKAGE_NAME="${PROJECT_NAME}"
MFB_PACKAGE_MODULE="${PROJECT_NAME}"
$<$<BOOL:${UFE_FOUND}>:WANT_UFE_BUILD>
$<$<BOOL:${IS_MACOSX}>:OSMac_>
$<$<BOOL:${IS_LINUX}>:LINUX>
$<$<BOOL:${IS_LINUX}>:GL_GLEXT_PROTOTYPES>
Expand Down
17 changes: 7 additions & 10 deletions lib/mayaUsd/base/debugCodes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,13 @@ PXR_NAMESPACE_OPEN_SCOPE

TF_REGISTRY_FUNCTION(TfDebug)
{
TF_DEBUG_ENVIRONMENT_SYMBOL(PXRUSDMAYA_REGISTRY,
"UsdMaya registration for usd types.");
TF_DEBUG_ENVIRONMENT_SYMBOL(PXRUSDMAYA_DIAGNOSTICS,
"Debugging of the the diagnostics batching system in UsdMaya.");
TF_DEBUG_ENVIRONMENT_SYMBOL(PXRUSDMAYA_TRANSLATORS,
"Debugging of translators.");
TF_DEBUG_ENVIRONMENT_SYMBOL(USDMAYA_PROXYSHAPEBASE,
"Base proxy shape evaluation");
TF_DEBUG_ENVIRONMENT_SYMBOL(USDMAYA_PROXYACCESSOR,
"Debugging of the evaluation for mixed data models.");
TF_DEBUG_ENVIRONMENT_SYMBOL(PXRUSDMAYA_REGISTRY, "UsdMaya registration for usd types.");
TF_DEBUG_ENVIRONMENT_SYMBOL(
PXRUSDMAYA_DIAGNOSTICS, "Debugging of the the diagnostics batching system in UsdMaya.");
TF_DEBUG_ENVIRONMENT_SYMBOL(PXRUSDMAYA_TRANSLATORS, "Debugging of translators.");
TF_DEBUG_ENVIRONMENT_SYMBOL(USDMAYA_PROXYSHAPEBASE, "Base proxy shape evaluation");
TF_DEBUG_ENVIRONMENT_SYMBOL(
USDMAYA_PROXYACCESSOR, "Debugging of the evaluation for mixed data models.");
}

PXR_NAMESPACE_CLOSE_SCOPE
5 changes: 2 additions & 3 deletions lib/mayaUsd/base/debugCodes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
#ifndef PXRUSDMAYA_DEBUGCODES_H
#define PXRUSDMAYA_DEBUGCODES_H

#include <pxr/pxr.h>
#include <pxr/base/tf/debug.h>
#include <pxr/pxr.h>

PXR_NAMESPACE_OPEN_SCOPE

Expand All @@ -26,8 +26,7 @@ TF_DEBUG_CODES(
PXRUSDMAYA_DIAGNOSTICS,
PXRUSDMAYA_TRANSLATORS,
USDMAYA_PROXYSHAPEBASE,
USDMAYA_PROXYACCESSOR
);
USDMAYA_PROXYACCESSOR);

PXR_NAMESPACE_CLOSE_SCOPE

Expand Down
Loading