Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-01-25 13:15:27 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-01-25 13:15:27 +0300
commitce6ba965dc4956910e51e40aff7707b6ac85e23d (patch)
treefc146e8bc8884b24023ee4874042ced4911f57e8 /source/blender
parentf4a418b03195e617e0d57a77e59f57e191e1cec5 (diff)
cleanup: warnings, spelling
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenkernel/intern/data_transfer.c2
-rw-r--r--source/blender/blenkernel/intern/mesh_remap.c2
-rw-r--r--source/blender/editors/render/render_preview.c2
-rw-r--r--source/blender/windowmanager/intern/wm_files.c12
4 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c
index 8c42aa7c940..3704174be6e 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 2dde0d919ec..7e94e17d1ff 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 ea80a07fdd4..16874bd49dc 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 94340759416..d159513e6a1 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;