[Bf-blender-cvs] [99feb10b8b2] master: Cleanup: warning, spelling

Campbell Barton noreply at git.blender.org
Mon Jul 6 15:09:08 CEST 2020


Commit: 99feb10b8b2ed68cb2743d3ac3464717ff65f9bd
Author: Campbell Barton
Date:   Mon Jul 6 23:01:36 2020 +1000
Branches: master
https://developer.blender.org/rB99feb10b8b2ed68cb2743d3ac3464717ff65f9bd

Cleanup: warning, spelling

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

M	source/blender/blenkernel/intern/gpencil.c
M	source/blender/bmesh/tools/bmesh_intersect_edges.c

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

diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 0a937d2b852..b94b71841dc 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -1555,7 +1555,7 @@ Material *BKE_gpencil_object_material_from_brush_get(Object *ob, Brush *brush)
  * Returns the material index for a brush with respect to its pinned state.
  * \param ob: Grease pencil object
  * \param brush: Brush
- * \return Materil index
+ * \return Material index.
  */
 int BKE_gpencil_object_material_get_index_from_brush(Object *ob, Brush *brush)
 {
@@ -1571,8 +1571,7 @@ int BKE_gpencil_object_material_get_index_from_brush(Object *ob, Brush *brush)
  * Guaranteed to return a material assigned to object. Returns never NULL.
  * \param bmain: Main pointer
  * \param ob: Grease pencil object
- * \param ts: Toolsettings
- * \return Material pointer
+ * \return Material pointer.
  */
 Material *BKE_gpencil_object_material_ensure_from_active_input_toolsettings(Main *bmain,
                                                                             Object *ob,
diff --git a/source/blender/bmesh/tools/bmesh_intersect_edges.c b/source/blender/bmesh/tools/bmesh_intersect_edges.c
index 22da5ad7406..52231033fd3 100644
--- a/source/blender/bmesh/tools/bmesh_intersect_edges.c
+++ b/source/blender/bmesh/tools/bmesh_intersect_edges.c
@@ -857,7 +857,7 @@ bool BM_mesh_intersect_edges(
         v_key = (*pair_iter)[0].vert;
         v_val = (*pair_iter)[1].vert;
         BMVert *v_target;
-        while (v_target = BLI_ghash_lookup(r_targetmap, v_val)) {
+        while ((v_target = BLI_ghash_lookup(r_targetmap, v_val))) {
           v_val = v_target;
         }
         if (v_val != (*pair_iter)[1].vert) {



More information about the Bf-blender-cvs mailing list