Revision: 76434
http://sourceforge.net/p/brlcad/code/76434
Author: starseeker
Date: 2020-07-22 21:40:29 +0000 (Wed, 22 Jul 2020)
Log Message:
-----------
Cherrypick r76433 from trunk
Modified Paths:
--------------
brlcad/branches/gedplugins/src/libgcv/plugins/asc/asc.cpp
brlcad/branches/gedplugins/src/libged/simulate/CMakeLists.txt
Property Changed:
----------------
brlcad/branches/gedplugins/
Index: brlcad/branches/gedplugins
===================================================================
--- brlcad/branches/gedplugins 2020-07-22 21:39:18 UTC (rev 76433)
+++ brlcad/branches/gedplugins 2020-07-22 21:40:29 UTC (rev 76434)
Property changes on: brlcad/branches/gedplugins
___________________________________________________________________
Modified: svn:mergeinfo
## -8,4 +8,5 ##
/brlcad/branches/opencl:65867-66137
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
-/brlcad/branches/tcltk86:68300-75257
\ No newline at end of property
+/brlcad/branches/tcltk86:68300-75257
+/brlcad/trunk:76433
\ No newline at end of property
Modified: brlcad/branches/gedplugins/src/libgcv/plugins/asc/asc.cpp
===================================================================
--- brlcad/branches/gedplugins/src/libgcv/plugins/asc/asc.cpp 2020-07-22
21:39:18 UTC (rev 76433)
+++ brlcad/branches/gedplugins/src/libgcv/plugins/asc/asc.cpp 2020-07-22
21:40:29 UTC (rev 76434)
@@ -36,10 +36,10 @@
#include "gcv/api.h"
#include "gcv/util.h"
-extern void asc_read_v4(struct gcv_context *c, const struct gcv_opts *o,
std::ifstream &fs);
-extern void asc_read_v5(struct gcv_context *c, const struct gcv_opts *o,
std::ifstream &fs);
-extern void asc_write_v4(struct gcv_context *c, const struct gcv_opts *o,
const char *dest_path);
-extern void asc_write_v5(struct gcv_context *c, const struct gcv_opts *o,
const char *dest_path);
+extern int asc_read_v4(struct gcv_context *c, const struct gcv_opts *o,
std::ifstream &fs);
+extern int asc_read_v5(struct gcv_context *c, const struct gcv_opts *o,
std::ifstream &fs);
+extern int asc_write_v4(struct gcv_context *c, const struct gcv_opts *o, const
char *dest_path);
+extern int asc_write_v5(struct gcv_context *c, const struct gcv_opts *o, const
char *dest_path);
static int
asc_can_read(const char *data)
Modified: brlcad/branches/gedplugins/src/libged/simulate/CMakeLists.txt
===================================================================
--- brlcad/branches/gedplugins/src/libged/simulate/CMakeLists.txt
2020-07-22 21:39:18 UTC (rev 76433)
+++ brlcad/branches/gedplugins/src/libged/simulate/CMakeLists.txt
2020-07-22 21:40:29 UTC (rev 76434)
@@ -45,6 +45,7 @@
CMAKEFILES(
CMakeLists.txt
+ ${bullet_srcs}
rt_collision_algorithm.hpp
rt_collision_shape.hpp
rt_debug_draw.hpp
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
