Commit 50456d25 authored by Nicolas Docquier's avatar Nicolas Docquier
Browse files

Merge branch 'Issue_176_Release_1_12_0' into 'release_1.12.0'

Issue 176 release 1 12 0

See merge request robotran/mbsysc!286
parents ff20e006 b2f2a788
...@@ -151,7 +151,7 @@ void mbs_print_user_models(MbsInfos* mbs_infos, char *fileoutC, char *fileoutH) ...@@ -151,7 +151,7 @@ void mbs_print_user_models(MbsInfos* mbs_infos, char *fileoutC, char *fileoutH)
} }
} }
fprintf(fidH, "%s", headerInclude); fprintf(fidH, "%s", headerInclude);
free(headerInclude);
fprintf(fidH, "\n"); fprintf(fidH, "\n");
fprintf(fidH, "#include \"mbs_user_interface.h\"\n"); fprintf(fidH, "#include \"mbs_user_interface.h\"\n");
fprintf(fidH, "// ============================================================ //\n\n"); fprintf(fidH, "// ============================================================ //\n\n");
......
...@@ -1572,7 +1572,7 @@ void mbs_info_structurer(MbsInfos *mbs_infos) ...@@ -1572,7 +1572,7 @@ void mbs_info_structurer(MbsInfos *mbs_infos)
mbs_infos->sensor_point_list = get_ivec_0(mbs_infos->n_sensor); mbs_infos->sensor_point_list = get_ivec_0(mbs_infos->n_sensor);
mbs_infos->extforce_point_list = get_ivec_0(mbs_infos->n_extforce); mbs_infos->extforce_point_list = get_ivec_0(mbs_infos->n_extforce);
mbs_infos->state_list = (MbsInfoParameter**)malloc(mbs_infos->n_point * sizeof(MbsInfoParameter*)); mbs_infos->state_list = (MbsInfoParameter**)malloc(mbs_infos->n_state * sizeof(MbsInfoParameter*));
for (i = 0; i < mbs_infos->base->n_base_point; i++) for (i = 0; i < mbs_infos->base->n_base_point; i++)
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment