Commit: 67f49f9c03c95eb3a62ece38db0ae8feafd4992e Author: Brecht Van Lommel Date: Wed Aug 14 23:26:26 2019 +0200 Branches: master https://developer.blender.org/rB67f49f9c03c95eb3a62ece38db0ae8feafd4992e
Cleanup: fix compiler warnings =================================================================== M source/blender/blenkernel/intern/mesh_convert.c M source/blender/editors/space_text/text_undo.c =================================================================== diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c index ee060a117dc..3a2ba078dce 100644 --- a/source/blender/blenkernel/intern/mesh_convert.c +++ b/source/blender/blenkernel/intern/mesh_convert.c @@ -978,7 +978,7 @@ static void curve_to_mesh_eval_ensure(Object *object) * * So we create temporary copy of the object which will use same data as the original bevel, but * will have no modifiers. */ - Object bevel_object = {NULL}; + Object bevel_object = {{NULL}}; if (remapped_curve.bevobj != NULL) { bevel_object = *remapped_curve.bevobj; BLI_listbase_clear(&bevel_object.modifiers); @@ -986,7 +986,7 @@ static void curve_to_mesh_eval_ensure(Object *object) } /* Same thing for taper. */ - Object taper_object = {NULL}; + Object taper_object = {{NULL}}; if (remapped_curve.taperobj != NULL) { taper_object = *remapped_curve.taperobj; BLI_listbase_clear(&taper_object.modifiers); diff --git a/source/blender/editors/space_text/text_undo.c b/source/blender/editors/space_text/text_undo.c index a6393291f9a..4a628cf70e4 100644 --- a/source/blender/editors/space_text/text_undo.c +++ b/source/blender/editors/space_text/text_undo.c @@ -187,6 +187,7 @@ static bool text_undosys_step_encode(struct bContext *C, Text *text = us->text_ref.ptr; BLI_assert(text == CTX_data_edit_text(C)); + UNUSED_VARS_NDEBUG(C); us->step.data_size += text_undosys_step_encode_to_state(&us->states[1], text); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs