diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2018-09-20 17:47:10 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2018-09-20 17:59:55 +0300 |
commit | cffae363813e92148a27604a69b7576ba6962962 (patch) | |
tree | b6044b493f3545e641ca1a81ab4a417bf723ecc1 | |
parent | 9a91e67825200986bb0fc3f10380a1112b2c75ef (diff) |
Fix build for MSVC: Remove trailing double semicolon
Not sure why but MSVC is complaining for some of those.
In particular for the struct in BKE_subdiv_ccg.h. Those were the ones
crashing here..
-rw-r--r-- | source/blender/blenkernel/BKE_subdiv_ccg.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 2 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_effects.c | 2 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_private.h | 2 | ||||
-rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_draw_utils.c | 2 | ||||
-rw-r--r-- | source/blender/editors/armature/armature_select.c | 2 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_add_gizmo.c | 2 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_ops.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_outliner/outliner_collections.c | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_framebuffer.c | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_material.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_wm.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_laplaciandeform.c | 2 |
13 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/blenkernel/BKE_subdiv_ccg.h b/source/blender/blenkernel/BKE_subdiv_ccg.h index ac90c5f7db3..cee7bce7f05 100644 --- a/source/blender/blenkernel/BKE_subdiv_ccg.h +++ b/source/blender/blenkernel/BKE_subdiv_ccg.h @@ -153,7 +153,7 @@ typedef struct SubdivCCG { /* Vertices which are adjacent to faces * Used for faster grid stitching, in the cost of extra memory. */ - int num_adjacent_vertices;; + int num_adjacent_vertices; SubdivCCGAdjacentVertex *adjacent_vertices; struct DMFlagMat *grid_flag_mats; diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 4674b2c7554..188559d4b14 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -3974,7 +3974,7 @@ static void followtrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase depsgraph, data->camera ? data->camera : scene->camera); - float ctime = DEG_get_ctime(depsgraph);; + float ctime = DEG_get_ctime(depsgraph); float framenr; if (data->flag & FOLLOWTRACK_ACTIVECLIP) diff --git a/source/blender/draw/engines/eevee/eevee_effects.c b/source/blender/draw/engines/eevee/eevee_effects.c index bb3938fe2c3..fe71558f74a 100644 --- a/source/blender/draw/engines/eevee/eevee_effects.c +++ b/source/blender/draw/engines/eevee/eevee_effects.c @@ -561,7 +561,7 @@ void EEVEE_draw_effects(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) /* Update double buffer status if render mode. */ if (DRW_state_is_image_render()) { stl->g_data->valid_double_buffer = (txl->color_double_buffer != NULL); - stl->g_data->valid_taa_history = (txl->taa_history != NULL);; + stl->g_data->valid_taa_history = (txl->taa_history != NULL); } } diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h index 62db134a117..35a1211ba4a 100644 --- a/source/blender/draw/engines/eevee/eevee_private.h +++ b/source/blender/draw/engines/eevee/eevee_private.h @@ -933,7 +933,7 @@ void EEVEE_motion_blur_free(void); /* eevee_mist.c */ void EEVEE_mist_output_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); -void EEVEE_mist_output_accumulate(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata);; +void EEVEE_mist_output_accumulate(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); void EEVEE_mist_free(void); /* eevee_temporal_sampling.c */ diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c index 39ab49cde28..516c27ae21d 100644 --- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c +++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c @@ -477,7 +477,7 @@ static DRWShadingGroup *DRW_gpencil_shgroup_point_create( /* object scale and depth */ if ((ob) && (id > -1)) { - stl->shgroups[id].obj_scale = mat4_to_scale(ob->obmat);; + stl->shgroups[id].obj_scale = mat4_to_scale(ob->obmat); DRW_shgroup_uniform_float(grp, "objscale", &stl->shgroups[id].obj_scale, 1); stl->shgroups[id].keep_size = (int)((gpd) && (gpd->flag & GP_DATA_STROKE_KEEPTHICKNESS)); DRW_shgroup_uniform_int(grp, "keep_size", &stl->shgroups[id].keep_size, 1); diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c index bccc8c795b3..95b9e1dafcf 100644 --- a/source/blender/editors/armature/armature_select.c +++ b/source/blender/editors/armature/armature_select.c @@ -129,7 +129,7 @@ Base *ED_armature_base_and_bone_from_select_buffer( if (base != NULL) { if (base->object->pose != NULL) { const uint hit_bone = (hit & ~BONESEL_ANY) >> 16; - bPoseChannel *pchan = BLI_findlink(&base->object->pose->chanbase, hit_bone);; + bPoseChannel *pchan = BLI_findlink(&base->object->pose->chanbase, hit_bone); bone = pchan ? pchan->bone : NULL; } } diff --git a/source/blender/editors/mesh/editmesh_add_gizmo.c b/source/blender/editors/mesh/editmesh_add_gizmo.c index 253f546c7af..7437d86e6b5 100644 --- a/source/blender/editors/mesh/editmesh_add_gizmo.c +++ b/source/blender/editors/mesh/editmesh_add_gizmo.c @@ -321,7 +321,7 @@ static void MESH_GGT_add_bounds(struct wmGizmoGroupType *gzgt) static int add_primitive_cube_gizmo_exec(bContext *C, wmOperator *op) { - Object *obedit = CTX_data_edit_object(C);; + Object *obedit = CTX_data_edit_object(C); BMEditMesh *em = BKE_editmesh_from_object(obedit); float matrix[4][4]; diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index b6be0959e9d..951949e18c6 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -4755,7 +4755,7 @@ static void SCREEN_OT_workspace_cycle(wmOperatorType *ot) /* api callbacks */ ot->invoke = space_workspace_cycle_invoke; - ot->poll = ED_operator_screenactive;; + ot->poll = ED_operator_screenactive; ot->flag = 0; diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c index f0feb7515ba..c1d86da3eab 100644 --- a/source/blender/editors/space_outliner/outliner_collections.c +++ b/source/blender/editors/space_outliner/outliner_collections.c @@ -226,7 +226,7 @@ void OUTLINER_OT_collection_new(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; /* properties */ - PropertyRNA *prop = RNA_def_boolean(ot->srna, "nested", true, "Nested", "Add as child of selected collection");; + PropertyRNA *prop = RNA_def_boolean(ot->srna, "nested", true, "Nested", "Add as child of selected collection"); RNA_def_property_flag(prop, PROP_SKIP_SAVE); } diff --git a/source/blender/gpu/intern/gpu_framebuffer.c b/source/blender/gpu/intern/gpu_framebuffer.c index ab96efe540a..270dc014f7b 100644 --- a/source/blender/gpu/intern/gpu_framebuffer.c +++ b/source/blender/gpu/intern/gpu_framebuffer.c @@ -198,7 +198,7 @@ GPUFrameBuffer *GPU_framebuffer_create(void) { /* We generate the FB object later at first use in order to * create the framebuffer in the right opengl context. */ - return MEM_callocN(sizeof(GPUFrameBuffer), "GPUFrameBuffer");; + return MEM_callocN(sizeof(GPUFrameBuffer), "GPUFrameBuffer"); } static void gpu_framebuffer_init(GPUFrameBuffer *fb) diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index a7eb533d9ef..d5aa7177e11 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -654,7 +654,7 @@ GPUMaterial *GPU_material_from_nodetree( BLI_assert(GPU_material_from_nodetree_find(gpumaterials, engine_type, options) == NULL); /* allocate material */ - GPUMaterial *mat = MEM_callocN(sizeof(GPUMaterial), "GPUMaterial");; + GPUMaterial *mat = MEM_callocN(sizeof(GPUMaterial), "GPUMaterial"); mat->scene = scene; mat->engine_type = engine_type; mat->options = options; diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index fd0759bfe42..7ceaa769d78 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -779,7 +779,7 @@ static void rna_workspace_screen_update(bContext *C, PointerRNA *ptr) static PointerRNA rna_Window_view_layer_get(PointerRNA *ptr) { wmWindow *win = ptr->data; - Scene *scene = WM_window_get_active_scene(win);; + Scene *scene = WM_window_get_active_scene(win); ViewLayer *view_layer = WM_window_get_active_view_layer(win); PointerRNA scene_ptr; diff --git a/source/blender/modifiers/intern/MOD_laplaciandeform.c b/source/blender/modifiers/intern/MOD_laplaciandeform.c index cb04c38902c..92ccf7feaa0 100644 --- a/source/blender/modifiers/intern/MOD_laplaciandeform.c +++ b/source/blender/modifiers/intern/MOD_laplaciandeform.c @@ -566,7 +566,7 @@ static void initSystem( mlooptri = BKE_mesh_runtime_looptri_ensure(mesh); - mloop = mesh->mloop;; + mloop = mesh->mloop; for (i = 0; i < sys->total_tris; i++) { sys->tris[i][0] = mloop[mlooptri[i].tri[0]].v; |