[Bf-blender-cvs] [00230608936] blender2.8: Cleanup: compiler warnings.

Brecht Van Lommel noreply at git.blender.org
Tue Aug 28 12:50:11 CEST 2018


Commit: 00230608936e4bf2143ac4caaff3fdcbe77bda3e
Author: Brecht Van Lommel
Date:   Tue Aug 28 11:47:16 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB00230608936e4bf2143ac4caaff3fdcbe77bda3e

Cleanup: compiler warnings.

===================================================================

M	source/blender/editors/gpencil/gpencil_paint.c
M	source/blender/editors/mesh/editmesh_select.c

===================================================================

diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index aa163e02cfe..4bd8c28a85c 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -753,7 +753,7 @@ static short gp_stroke_addpoint(
 		if (gp_stroke_added_check(p)) {
 			bGPDstroke *gps = p->gpf->strokes.last;
 			bGPDspoint *pts;
-			MDeformVert *dvert;
+			MDeformVert *dvert = NULL;
 
 			/* first time point is adding to temporary buffer -- need to allocate new point in stroke */
 			if (gpd->runtime.sbuffer_size == 0) {
@@ -792,7 +792,7 @@ static short gp_stroke_addpoint(
 			pts->uv_fac = pt->uv_fac;
 			pts->uv_rot = pt->uv_rot;
 
-			if (gps->dvert != NULL) {
+			if (dvert != NULL) {
 				dvert->totweight = 0;
 				dvert->dw = NULL;
 			}
diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c
index 7ecd2c69838..280b8f91151 100644
--- a/source/blender/editors/mesh/editmesh_select.c
+++ b/source/blender/editors/mesh/editmesh_select.c
@@ -1754,9 +1754,13 @@ static bool mouse_mesh_loop(bContext *C, const int mval[2], bool extend, bool de
 		ED_view3d_viewcontext_init_object(&vc, basact->object);
 		em = vc.em;
 	}
+	else {
+		em = NULL;
+	}
+
 	em_original->selectmode = selectmode;
 
-	if (eed == NULL) {
+	if (em == NULL || eed == NULL) {
 		return false;
 	}



More information about the Bf-blender-cvs mailing list