[Bf-blender-cvs] [f65a8bbdb7b] master: Correct invalid assert use

Campbell Barton noreply at git.blender.org
Mon Jul 24 09:19:54 CEST 2017


Commit: f65a8bbdb7b44b335a9a43c6661a7fdebd519287
Author: Campbell Barton
Date:   Mon Jul 24 17:32:09 2017 +1000
Branches: master
https://developer.blender.org/rBf65a8bbdb7b44b335a9a43c6661a7fdebd519287

Correct invalid assert use

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

M	source/blender/editors/gpencil/gpencil_brush.c
M	source/blender/editors/render/render_shading.c

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

diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c
index 5332bec0c64..e5fb162a96c 100644
--- a/source/blender/editors/gpencil/gpencil_brush.c
+++ b/source/blender/editors/gpencil/gpencil_brush.c
@@ -710,7 +710,7 @@ static bool gp_brush_randomize_apply(tGP_BrushEditData *gso, bGPDstroke *gps, in
 			}
 			else {
 				/* ERROR */
-				BLI_assert("3D stroke being sculpted in non-3D view");
+				BLI_assert(!"3D stroke being sculpted in non-3D view");
 			}
 		}
 		else {
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c
index 0878636d0fa..9bdb34f5384 100644
--- a/source/blender/editors/render/render_shading.c
+++ b/source/blender/editors/render/render_shading.c
@@ -1818,7 +1818,7 @@ static void paste_mtex_copybuf(ID *id)
 			mtex = &(((FreestyleLineStyle *)id)->mtex[(int)((FreestyleLineStyle *)id)->texact]);
 			break;
 		default:
-			BLI_assert("invalid id type");
+			BLI_assert(!"invalid id type");
 			return;
 	}




More information about the Bf-blender-cvs mailing list