[Bf-blender-cvs] [91809c0] missing-libs: Cleanup: naming, typo

[Campbell Barton]

Commit: 91809c0217cca09b29963c850c4388a107d415e9
Author: Campbell Barton
Date:   Tue Oct 20 20:00:41 2015 +1100
Branches: missing-libs
https://developer.blender.org/rB91809c0217cca09b29963c850c4388a107d415e9

Cleanup: naming, typo

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

M	source/blender/blenkernel/BKE_material.h
M	source/blender/blenkernel/intern/library.c
M	source/blender/blenkernel/intern/material.c
M	source/blender/blenlib/intern/memory_utils.c

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

diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h
index b85f9e5..d32d679 100644
--- a/source/blender/blenkernel/BKE_material.h
+++ b/source/blender/blenkernel/BKE_material.h
@@ -49,7 +49,7 @@ void BKE_material_free(struct Material *sc);
 void BKE_material_free_ex(struct Material *ma, bool do_id_user);
 void test_object_materials(struct Main *bmain, struct ID *id);
 void BKE_material_resize_object(struct Object *ob, const short totcol, bool do_id_user);
-void BKE_init_material(struct Material *ma);
+void BKE_material_init(struct Material *ma);
 void BKE_material_remap_object(struct Object *ob, const unsigned int *remap);
 struct Material *BKE_material_add(struct Main *bmain, const char *name);
 struct Material *BKE_material_copy(struct Material *ma);
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index d29eaee..f8f9282 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -817,7 +817,7 @@ void BKE_libblock_init_empty(ID *id)
 			BKE_mball_init((MetaBall *)id);
 			break;
 		case ID_MA:
-			BKE_init_material((Material *)id);
+			BKE_material_init((Material *)id);
 			break;
 		case ID_TE:
 			BKE_texture_default((Tex *)id);
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 051324e..a69b5fd 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -78,7 +78,7 @@ Material defmaterial;
 /* called on startup, creator.c */
 void init_def_material(void)
 {
-	BKE_init_material(&defmaterial);
+	BKE_material_init(&defmaterial);
 }
 
 /* not material itself */
@@ -122,7 +122,7 @@ void BKE_material_free_ex(Material *ma, bool do_id_user)
 		GPU_material_free(&ma->gpumaterial);
 }
 
-void BKE_init_material(Material *ma)
+void BKE_material_init(Material *ma)
 {
 	BLI_assert(MEMCMP_STRUCT_OFS_IS_ZERO(ma, id));
 
@@ -223,7 +223,7 @@ Material *BKE_material_add(Main *bmain, const char *name)
 
 	ma = BKE_libblock_alloc(bmain, ID_MA, name);
 	
-	BKE_init_material(ma);
+	BKE_material_init(ma);
 	
 	return ma;
 }
diff --git a/source/blender/blenlib/intern/memory_utils.c b/source/blender/blenlib/intern/memory_utils.c
index 1c1f408..b17c6ff 100644
--- a/source/blender/blenlib/intern/memory_utils.c
+++ b/source/blender/blenlib/intern/memory_utils.c
@@ -20,9 +20,9 @@
 
 /** \file blender/blenlib/intern/memory_utils.c
  *  \ingroup bli
- *  \brief Generic array manipulation API.
+ *  \brief Generic memory manipulation API.
  *
- * \warning This is to extend on existing functions
+ * This is to extend on existing functions
  * such as ``memcpy`` & ``memcmp``.
  */
 #include <string.h>