Skip to content

Commit ffab3a1

Browse files
committed
Merge branch 'dev-3.0.7'
2 parents b923064 + 7a2d446 commit ffab3a1

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
v3.0.7
2+
------
3+
- Updated Slang to 0.10.31
4+
5+
Bug Fixes:
6+
- Fixed a crash when rendering a VariablesBuffer/ConstantBuffer UI without specifying a group name
7+
18
v3.0.6
29
------
310
- Changed max bones to 256

Framework/Source/Falcor.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,5 +160,5 @@
160160
#define FALCOR_MAJOR_VERSION 3
161161
#define FALCOR_MINOR_VERSION 0
162162
#define FALCOR_DEV_STAGE ""
163-
#define FALCOR_DEV_REVISION 6
164-
#define FALCOR_VERSION_STRING "3.0.6"
163+
#define FALCOR_DEV_REVISION 7
164+
#define FALCOR_VERSION_STRING "3.0.7"

Framework/Source/Utils/VariablesBufferUI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ namespace Falcor
287287
// dirty flag for uploading will be set by GUI
288288
mVariablesBufferRef.uploadToGPU();
289289

290-
pGui->endGroup();
290+
if(uiGroup != nullptr) pGui->endGroup();
291291
}
292292
}
293293
}

dependencies.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
<package name="rapidjson" version="1.1.0" />
3030
</dependency>
3131
<dependency name="slang" linkPath="Framework/Externals/Slang">
32-
<package name="slang" version="0.10.30" remotes="github-slang" />
33-
<package name="slang" version="0.10.30" remotes="github-slang-linux" platforms="linux" />
32+
<package name="slang" version="0.10.31" remotes="github-slang" />
33+
<package name="slang" version="0.10.31" remotes="github-slang-linux" platforms="linux" />
3434
</dependency>
3535
<dependency name="glfw" linkPath="Framework/Externals/GLFW">
3636
<package name="glfw" version="3.2.1" platforms="win" />

0 commit comments

Comments
 (0)