Skip to content

Commit 6116fbe

Browse files
author
Guillaume Laforge
committed
Merge branch 'dev'
2 parents 739f280 + e4434d5 commit 6116fbe

25 files changed

+439
-833
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
build
2-
32
# Maya
43
*.mayaSwatches
54

‎CHANGELOG.md‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# Change Log
2+
3+
## [1.2.0] - 2018-09-25
4+
5+
### Added
6+
- Build system: Added option in vfx_platform_builder script to disable
7+
requirement for Houdini or Katana plugins.
8+
- Katana: Handle USD purposes in KatanaPlugin.
9+
"guide" and "proxy" are viewed in the viewport but not in renderer.
10+
"render" is viewed everywhere (viewport and render).
11+
- Katana: Handle USD Lights.
12+
All lights are scanned and put into a lightList at /root/world in Katana
13+
to ensure the renderer find them. Since UsdLuxLight is not a concrete schema,
14+
we made an ArnoldLight that inherits from UsdLuxLight and allow us to have generic
15+
ArnoldLight into USD scene.
16+
- Maya: Variants support in the Walter outliner.
17+
- Arnold: primvar support for Usd PointInstancer
18+
19+
### Fixed
20+
- Arnold: Texture coords stretching issue resolved.
21+
- Katana: crash when scene graph is evaluated and layers are changed.
22+
- Build system: The 'debug' flag is now propagated to every dependencies
23+
24+
### Removed
25+
- Arnold: Version 4 is not supported anymore.
26+
- MtoA Extension: jsoncpp dependency not needed anymore.
27+
28+
## [1.1.0] - 2018-08-30
29+
30+
### Added
31+
- Katana: USD PointInstancer support using an procedural location.
32+
33+
### Removed
34+
- MtoA Extension: jsoncpp dependency not needed anymore.
35+
36+
## [1.0.1] - 2018-08-09
37+
38+
### Changed
39+
- New Walter icons in Maya and Houdini.
40+
41+
## [1.0.0] - 2018-08-08
42+
43+
Initial release

‎Makefile‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,15 @@
1515
# Set environment variables for the build.
1616

1717
# 'Release' or 'Debug'
18-
BUILD_CONFIG := Release
18+
19+
MAKE_MODE := release
20+
ifeq "$(MAKE_MODE)" "debug"
21+
CMAKE_BUILD_TYPE := Debug
22+
else
23+
CMAKE_BUILD_TYPE := Release
24+
endif
25+
26+
1927
VERBOSE := 1
2028
BUILD_TESTS := ON
2129
BUILD_HOUDINI_PLUGINS := ON
@@ -186,7 +194,7 @@ $(WALTER_DCC_STAMP) : $(USD_DCC_STAMP) $(JSONCPP_STAMP) $(GOOGLETEST_STAMP) $(OP
186194
-DBUILD_TESTS=$(BUILD_TESTS) \
187195
-DBUILD_VIEWER=$(BUILD_VIEWER) \
188196
-DBoost_NAMESPACE=$(BOOST_NAMESPACE) \
189-
-DCMAKE_BUILD_TYPE=$(BUILD_CONFIG) \
197+
-DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \
190198
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
191199
-DCMAKE_INSTALL_PREFIX=$(PREFIX_ROOT)/walter \
192200
-DCMAKE_SHARED_LINKER_FLAGS=-Wl,--no-undefined \
@@ -229,7 +237,7 @@ $(WALTER_DCC_STAMP) : $(USD_DCC_STAMP) $(JSONCPP_STAMP) $(GOOGLETEST_STAMP) $(OP
229237
-DUSE_STATIC_HDF5=ON \
230238
-DZLIB_ROOT=$(PREFIX_ROOT)/zlib \
231239
$(THIS_DIR)/walter && \
232-
$(CMAKE) --build . --target install --config $(BUILD_CONFIG) -- -j$(JOB_COUNT) && \
240+
$(CMAKE) --build . --target install --config $(CMAKE_BUILD_TYPE) -- -j$(JOB_COUNT) && \
233241
echo timestamp > $(WALTER_DCC_STAMP)
234242

235243
# fast build rule for target.
@@ -260,7 +268,7 @@ $(WALTER_PROCEDURAL_STAMP) : $(USD_PROCEDURAL_STAMP) $(JSONCPP_STAMP) $(OPENVDB_
260268
-DBUILD_MAYA_PLUGINS=OFF \
261269
-DBUILD_TESTS=ON \
262270
-DBoost_NAMESPACE=$(BOOST_NAMESPACE) \
263-
-DCMAKE_BUILD_TYPE=$(BUILD_CONFIG) \
271+
-DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \
264272
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
265273
-DCMAKE_INSTALL_PREFIX=$(PREFIX_ROOT)/walter \
266274
-DCMAKE_SHARED_LINKER_FLAGS=-Wl,--no-undefined \
@@ -303,7 +311,7 @@ $(WALTER_PROCEDURAL_STAMP) : $(USD_PROCEDURAL_STAMP) $(JSONCPP_STAMP) $(OPENVDB_
303311
-DUSE_STATIC_HDF5=ON \
304312
-DZLIB_ROOT=$(PREFIX_ROOT)/zlib \
305313
$(THIS_DIR)/walter && \
306-
$(CMAKE) --build . --target install --config $(BUILD_CONFIG) -- -j$(JOB_COUNT)
314+
$(CMAKE) --build . --target install --config $(CMAKE_BUILD_TYPE) -- -j$(JOB_COUNT)
307315
echo timestamp > $(WALTER_PROCEDURAL_STAMP)
308316

309317
# fast build rule for target.
@@ -325,6 +333,7 @@ vfx_builder = \
325333
echo "Building" $(1) "for Walter" && \
326334
cd $(THIS_DIR)/vfx_platform_builder && \
327335
make CC=$(GCC_BIN_PATH)/gcc CXX=$(GCC_BIN_PATH)/g++ \
336+
MAKE_MODE=$(MAKE_MODE) \
328337
USD_PACKAGE_NAME=$(2) \
329338
BOOST_NAMESPACE=$(3) \
330339
TBB_NAMESPACE=$(4) \
@@ -345,11 +354,11 @@ help:
345354
printf '\tlibXxf86vm-devel libXrandr-devel libXinerama-devel\n' ; \
346355
printf '\tlibXcursor-devel libXi-devel libXt-devel\n\n' ; \
347356
printf 'Usage to build all (VFX Platform, Walter for Katana, Houdini, Maya and Arnold):\n' ; \
348-
printf '\tmake\nor\n\tmake BUILD_CONFIG=Debug\n\n' ; \
357+
printf '\tmake\nor\n\tmake MAKE_MODE=debug\n\n' ; \
349358
printf 'Options:\n' ; \
350359
printf '\tCC\t\t: C copiler path.\t value: $(CC)\n' ; \
351360
printf '\tCXX\t\t: C++ copiler path.\t value: $(CXX)\n' ; \
352-
printf '\tBUILD_CONFIG\t: Debug|Release.\t value: $(BUILD_CONFIG)\n' ; \
361+
printf '\tMAKE_MODE\t: debug|release.\t value: $(MAKE_MODE)\n' ; \
353362
printf '\tSOURCES_ROOT\t: Source directory.\t value: $(SOURCES_ROOT)\n' ; \
354363
printf '\tBUILD_ROOT\t: Building directory.\t value: $(BUILD_ROOT)\n' ; \
355364
printf '\tPREFIX_ROOT\t: Installation dir.\t value: $(PREFIX_ROOT)\n' ; \

‎README.md‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
![Open Walter](https://www.rodeofx.com/uploads/images/tech/Walter_logo_mini-01.png)
22

3+
[![Join the chat at https://gitter.im/OpenWalter/Lobby](https://badges.gitter.im/OpenWalter/Lobby.svg)](https://gitter.im/OpenWalter/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
4+
35
Walter is suite of plugins using USD for various DCCs and renderer.
46

57
It's main goal is to stay as much as possible in the [*USD Stage*](http://graphics.pixar.com/usd/docs/USD-Glossary.html#USDGlossary-Stage)
@@ -41,7 +43,7 @@ The following versions were used in production.
4143

4244
| Application | Version |
4345
| ----------------| --------- |
44-
| Arnold | 4.2.16.2, 5.0.2.4, 5.1.1.1 |
46+
| Arnold | 5.0.2.4, 5.1.1.1 |
4547
| Houdini | 16.5.350, 16.5.496 |
4648
| Katana | 2.5v7, 3.0.2 |
4749
| Maya | 2016SP4, 2018.3 |
@@ -103,7 +105,7 @@ You must set the Arnold root path in your environment.
103105

104106
| Variable Name | Description | Version |
105107
| ----------------- | ----------------------------------- | --------- |
106-
| ARNOLD_ROOT | The root path to Arnold install | 4.2.16.2 5.0.2.4 5.1.1.1 |
108+
| ARNOLD_ROOT | The root path to Arnold install | 5.0.2.4 5.1.1.1 |
107109

108110

109111
##### Houdini Plugin
@@ -121,7 +123,7 @@ You must set the Houdini and HtoA root paths in your environment.
121123
| Variable Name | Description | Version |
122124
| ----------------- | ----------------------------------- | --------- |
123125
| HOUDINI_ROOT | The root path to Houdini install | 16.5.350 16.5.496 |
124-
| HTOA_ROOT | The root path to HtoA install | 2.2.4 3.0.3 |
126+
| HTOA_ROOT | The root path to HtoA install | 3.0.3 |
125127

126128

127129
##### Katana Plugin
@@ -135,7 +137,7 @@ You must set the Maya and MtoA root paths in your environment.
135137
| Variable Name | Description | Version |
136138
| ----------------- | ----------------------------------- | --------- |
137139
| KATANA_ROOT | The root path to Katana install | 2.5v7 3.0.2 |
138-
| KTOA_ROOT | The root path to KtoA install | 2.0.4.0 2.0.8.0 2.1.2.0 |
140+
| KTOA_ROOT | The root path to KtoA install | 2.1.2.0 |
139141

140142
##### Maya Plugin
141143

@@ -171,7 +173,7 @@ You must set the Maya and MtoA install paths in your environment.
171173
| Variable Name | Description | Version |
172174
| ----------------- | ----------------------------------- | --------- |
173175
| MAYA_ROOT | The root path to Maya install | 2016SP4 2018.3 |
174-
| MTOA_ROOT | The root path to MtoA install | 1.4.2 2.0.2.2 3.0.1.1 |
176+
| MTOA_ROOT | The root path to MtoA install | 3.0.1.1 |
175177

176178
For example:
177179
```

‎vfx_platform_builder/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1820,6 +1820,7 @@ $(USD_STAMP) : $(ALEMBIC_STAMP) $(BOOST_STAMP) $(CMAKE_STAMP) $(DC_STAMP) $(EMBR
18201820
( git am $(THIS_DIR)/patches/USD/0018-RDO-the-ability-to-reference-a-root.patch ) && \
18211821
( git am $(THIS_DIR)/patches/USD/0019-RDO-USD-AlembicReader-Suppress-warnings.patch ) && \
18221822
( git am $(THIS_DIR)/patches/USD/0020-RDO-hdEngine-v0.8.5-broke-our-hdEmbree-plugin-when-used-.patch ) && \
1823+
( git am $(THIS_DIR)/patches/USD/0021-RDO-USD-Alembic-Fixed-texture-stretching-artifacts.patch ) && \
18231824
( printf "/find_library.*OPENEXR_.*_LIBRARY/a\nNAMES\n\044{OPENEXR_LIB}-2_2\n.\nw\nq" | ed -s cmake/modules/FindOpenEXR.cmake ) && \
18241825
( printf "/PATH_SUFFIXES/-a\n\"\044{OPENEXR_BASE_DIR}\"\n.\nw\nq" | ed -s cmake/modules/FindOpenEXR.cmake ) && \
18251826
( printf "/^namespace boost/s/namespace boost/namespace ${BOOST_NAMESPACE}/\nw\nq" | ed -s pxr/base/lib/tf/weakPtrFacade.h ) && \

0 commit comments

Comments
 (0)