mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libgltf: fix up this patch, some forgotten changes

Browse Source 
Change-Id: I0fe3ee06d8112207f3ae3e0e8e40fa74d043ce11
This commit is contained in:
Zolnai Tamás 2014-06-13 01:19:11 +02:00
parent 3d300f1e86
commit fd8cee8c1f
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
external/libgltf/patches/init_scene_set_handle.patch vendored
View File

@ -1,6 +1,6 @@
diff -ur libgltf.org/src/LoadScene.cpp libgltf/src/LoadScene.cpp diff -ur libgltf.org/src/LoadScene.cpp libgltf/src/LoadScene.cpp
--- libgltf.org/src/LoadScene.cpp 2014-06-12 12:11:58.945707220 +0200 --- libgltf.org/src/LoadScene.cpp 2014-06-13 01:13:40.654653289 +0200
+++ libgltf/src/LoadScene.cpp 2014-06-12 12:13:14.129704086 +0200 +++ libgltf/src/LoadScene.cpp 2014-06-13 01:15:45.034648018 +0200
@@ -148,10 +148,14 @@ @@ -148,10 +148,14 @@
return true; return true;
} }
@ -19,8 +19,8 @@ diff -ur libgltf.org/src/LoadScene.cpp libgltf/src/LoadScene.cpp
{ {
TRACE_TIME ("parseScene->readBuffers", CPU); TRACE_TIME ("parseScene->readBuffers", CPU);
diff -ur libgltf.org/src/LoadScene.h libgltf/src/LoadScene.h diff -ur libgltf.org/src/LoadScene.h libgltf/src/LoadScene.h
--- libgltf.org/src/LoadScene.h 2014-06-12 12:11:58.945707220 +0200 --- libgltf.org/src/LoadScene.h 2014-06-13 01:13:40.654653289 +0200
+++ libgltf/src/LoadScene.h 2014-06-12 12:12:11.805706684 +0200 +++ libgltf/src/LoadScene.h 2014-06-13 01:16:03.886647220 +0200
@@ -27,7 +27,8 @@ @@ -27,7 +27,8 @@
public: public:
glTFHandle* getFileNameInJson(const std::string& jsonFile); glTFHandle* getFileNameInJson(const std::string& jsonFile);
@ -39,8 +39,8 @@ diff -ur libgltf.org/src/LoadScene.h libgltf/src/LoadScene.h
\ No newline at end of file \ No newline at end of file
+#endif +#endif
diff -ur libgltf.org/src/RenderScene.cpp libgltf/src/RenderScene.cpp diff -ur libgltf.org/src/RenderScene.cpp libgltf/src/RenderScene.cpp
--- libgltf.org/src/RenderScene.cpp 2014-06-12 12:11:58.949707220 +0200 --- libgltf.org/src/RenderScene.cpp 2014-06-13 01:13:40.654653289 +0200
+++ libgltf/src/RenderScene.cpp 2014-06-12 12:12:13.509706613 +0200 +++ libgltf/src/RenderScene.cpp 2014-06-13 01:15:11.222649451 +0200
@@ -561,7 +561,7 @@ @@ -561,7 +561,7 @@
{ {
return LIBGLTF_PARSE_JSON_ERROR; return LIBGLTF_PARSE_JSON_ERROR;
@ -77,7 +77,19 @@ diff -ur libgltf.org/src/RenderScene.cpp libgltf/src/RenderScene.cpp
} }
unsigned int RenderScene::bindAttribute(const Attribute* pAttr) unsigned int RenderScene::bindAttribute(const Attribute* pAttr)
@@ -1543,4 +1546,4 @@ @@ -844,11 +847,6 @@
int RenderScene::initRender(glTFHandle* handle)
{
- pScene = new Scene();
- if(0 == pScene)
- {
- return LIBGLTF_MEMORY_ERROR;
- }
int iResult = loadScene(*pScene, handle);
if( iResult != LIBGLTF_SUCESS)
{
@@ -1543,4 +1541,4 @@
int RenderScene::isAnimPlay() int RenderScene::isAnimPlay()
{ {
return this->mAnimationPlay ? 1 : 0; return this->mAnimationPlay ? 1 : 0;