[Bf-blender-cvs] [ce6ba96] master: cleanup: warnings, spelling

[Campbell Barton]

Commit: ce6ba965dc4956910e51e40aff7707b6ac85e23d
Author: Campbell Barton
Date:   Sun Jan 25 21:15:27 2015 +1100
Branches: master
https://developer.blender.org/rBce6ba965dc4956910e51e40aff7707b6ac85e23d

cleanup: warnings, spelling

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

M       source/blender/blenkernel/intern/data_transfer.c
M       source/blender/blenkernel/intern/mesh_remap.c
M       source/blender/editors/render/render_preview.c
M       source/blender/windowmanager/intern/wm_files.c

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

diff --git a/source/blender/blenkernel/intern/data_transfer.c 
b/source/blender/blenkernel/intern/data_transfer.c
index 8c42aa7..3704174 100644
--- a/source/blender/blenkernel/intern/data_transfer.c
+++ b/source/blender/blenkernel/intern/data_transfer.c
@@ -973,7 +973,7 @@ bool BKE_object_data_transfer_dm(
 
        MeshPairRemap geom_map[DATAMAX] = {{0}};
        bool geom_map_init[DATAMAX] = {0};
-       ListBase lay_map = {0};
+       ListBase lay_map = {NULL};
        bool changed = false;
 
        const bool use_delete = false;  /* We never delete data layers from 
destination here. */
diff --git a/source/blender/blenkernel/intern/mesh_remap.c 
b/source/blender/blenkernel/intern/mesh_remap.c
index 2dde0d9..7e94e17 100644
--- a/source/blender/blenkernel/intern/mesh_remap.c
+++ b/source/blender/blenkernel/intern/mesh_remap.c
@@ -1427,7 +1427,7 @@ void BKE_mesh_remap_calc_loops_from_dm(
                                        best_island = use_islands ? 
island_store.islands[best_island_index] : NULL;
                                        as_graph = 
&as_graphdata[best_island_index];
                                        poly_island_index_map = (int 
*)as_graph->custom_data;
-                                       BLI_astar_solution_init(as_graph, 
&as_solution, false);
+                                       BLI_astar_solution_init(as_graph, 
&as_solution, NULL);
                                }
 
                                for (plidx_dst = 0; plidx_dst < 
mp_dst->totloop; plidx_dst++) {
diff --git a/source/blender/editors/render/render_preview.c 
b/source/blender/editors/render/render_preview.c
index ea80a07..16874bd 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -1100,7 +1100,7 @@ static void icon_preview_free(void *customdata)
 
 void ED_preview_icon_render(Scene *scene, ID *id, unsigned int *rect, int 
sizex, int sizey)
 {
-       IconPreview ip = {0};
+       IconPreview ip = {NULL};
        short stop = false, update = false;
        float progress = 0.0f;
 
diff --git a/source/blender/windowmanager/intern/wm_files.c 
b/source/blender/windowmanager/intern/wm_files.c
index 9434075..d159513 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -535,11 +535,13 @@ bool WM_file_read(bContext *C, const char *filepath, 
ReportList *reports)
 }
 
 
-/* called on startup,  (context entirely filled with NULLs) */
-/* or called for 'New File' */
-/* both startup.blend and userpref.blend are checked */
-/* the optional paramater custom_file points to an alterntive startup page */
-/* custom_file can be NULL */
+/**
+ * called on startup,  (context entirely filled with NULLs)
+ * or called for 'New File'
+ * both startup.blend and userpref.blend are checked
+ * the optional parameter custom_file points to an alterntive startup page
+ * custom_file can be NULL
+ */
 int wm_homefile_read(bContext *C, ReportList *reports, bool from_memory, const 
char *custom_file)
 {
        ListBase wmbase;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs