Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
8d604046
O
obs-studio
项目概览
尘离序散
/
obs-studio
与 Fork 源项目一致
从无法访问的项目Fork
通知
30
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
obs-studio
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
8d604046
编写于
1月 16, 2018
作者:
J
Jim
提交者:
GitHub
1月 16, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1155 from DDRBoxman/scripting
deps/obs-scripting: Various scripting fixes
上级
db2d4c97
4390a0e7
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
6 addition
and
3 deletion
+6
-3
UI/CMakeLists.txt
UI/CMakeLists.txt
+1
-0
deps/obs-scripting/obs-scripting-lua.c
deps/obs-scripting/obs-scripting-lua.c
+3
-3
deps/obs-scripting/obslua/obslua.i
deps/obs-scripting/obslua/obslua.i
+2
-0
未找到文件。
UI/CMakeLists.txt
浏览文件 @
8d604046
...
...
@@ -271,6 +271,7 @@ target_link_libraries(obs
${
obs_PLATFORM_LIBRARIES
}
)
if
(
APPLE
)
set_target_properties
(
obs PROPERTIES LINK_FLAGS
"-pagezero_size 10000 -image_base 100000000"
)
set_property
(
TARGET obs
APPEND
...
...
deps/obs-scripting/obs-scripting-lua.c
浏览文件 @
8d604046
...
...
@@ -111,6 +111,8 @@ static bool load_lua_script(struct obs_lua_script *data)
goto
fail
;
}
current_lua_script
=
data
;
add_lua_source_functions
(
script
);
add_hook_functions
(
script
);
#if UI_ENABLED
...
...
@@ -171,8 +173,6 @@ static bool load_lua_script(struct obs_lua_script *data)
else
data
->
save
=
LUA_REFNIL
;
current_lua_script
=
data
;
lua_getglobal
(
script
,
"script_defaults"
);
if
(
lua_isfunction
(
script
,
-
1
))
{
ls_push_libobs_obj
(
obs_data_t
,
data
->
base
.
settings
,
false
);
...
...
@@ -214,7 +214,7 @@ fail:
pthread_mutex_unlock
(
&
data
->
mutex
);
}
if
(
!
success
)
{
if
(
!
success
&&
script
)
{
lua_close
(
script
);
}
...
...
deps/obs-scripting/obslua/obslua.i
浏览文件 @
8d604046
...
...
@@ -8,6 +8,7 @@
#
include
<
graphics
/
vec3
.
h
>
#
include
<
graphics
/
vec2
.
h
>
#
include
<
graphics
/
quat
.
h
>
#
include
<
graphics
/
image-file
.
h
>
#
include
<
obs
.
h
>
#
include
<
obs-hotkey
.
h
>
#
include
<
obs-source
.
h
>
...
...
@@ -81,6 +82,7 @@ static inline void wrap_blog(int log_level, const char *message)
%
include
"graphics/vec3.h"
%
include
"graphics/vec2.h"
%
include
"graphics/quat.h"
%
include
"graphics/image-file.h"
%
include
"obs-data.h"
%
include
"obs-source.h"
%
include
"obs-properties.h"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录