[Bf-blender-cvs] [e4b716a] master: Cleanup: warnings, style

Campbell Barton noreply at git.blender.org
Fri Jul 24 23:51:32 CEST 2015


Commit: e4b716a03f75e4ca99af246b340e9f74ac80ebef
Author: Campbell Barton
Date:   Sat Jul 25 07:40:02 2015 +1000
Branches: master
https://developer.blender.org/rBe4b716a03f75e4ca99af246b340e9f74ac80ebef

Cleanup: warnings, style

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

M	source/blender/blenkernel/BKE_data_transfer.h
M	source/blender/blenlib/BLI_timecode.h
M	source/blender/compositor/operations/COM_RenderLayersProg.cpp
M	source/blender/editors/physics/particle_edit.c

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

diff --git a/source/blender/blenkernel/BKE_data_transfer.h b/source/blender/blenkernel/BKE_data_transfer.h
index 7c64d52..2ee9d8d 100644
--- a/source/blender/blenkernel/BKE_data_transfer.h
+++ b/source/blender/blenkernel/BKE_data_transfer.h
@@ -134,7 +134,7 @@ void BKE_object_data_transfer_layout(
 
 bool BKE_object_data_transfer_mesh(
         struct Scene *scene,
-        struct Object *ob_src, struct Object *ob_dst, const int data_types, bool use_create,
+        struct Object *ob_src, struct Object *ob_dst, const int data_types, const bool use_create,
         const int map_vert_mode, const int map_edge_mode, const int map_loop_mode, const int map_poly_mode,
         struct SpaceTransform *space_transform, const bool auto_transform,
         const float max_distance, const float ray_radius, const float islands_handling_precision,
diff --git a/source/blender/blenlib/BLI_timecode.h b/source/blender/blenlib/BLI_timecode.h
index 8f88b55..235d928 100644
--- a/source/blender/blenlib/BLI_timecode.h
+++ b/source/blender/blenlib/BLI_timecode.h
@@ -39,7 +39,7 @@ size_t BLI_timecode_string_from_time(
         ATTR_NONNULL();
 
 size_t BLI_timecode_string_from_time_simple(
-        char *str, size_t maxlen, double time_seconds)
+        char *str, size_t maxlen, const double time_seconds)
         ATTR_NONNULL();
 
 size_t BLI_timecode_string_from_time_seconds(
diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.cpp b/source/blender/compositor/operations/COM_RenderLayersProg.cpp
index 999565d..1a7e775 100644
--- a/source/blender/compositor/operations/COM_RenderLayersProg.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersProg.cpp
@@ -398,7 +398,7 @@ RenderLayersCyclesDebugOperation::RenderLayersCyclesDebugOperation(
         int debug_pass_type)
 	: RenderLayersBaseProg(pass, RE_debug_pass_num_channels_get(debug_pass_type))
 {
-	switch(m_elementsize) {
+	switch (m_elementsize) {
 		case 1:
 			this->addOutputSocket(COM_DT_VALUE);
 			break;
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index f5f3f91..e26d83a 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -425,7 +425,7 @@ static bool PE_create_shape_tree(PEData *data, Object *shapeob)
 	}
 	
 	DM_ensure_looptri(dm);
-	return bvhtree_from_mesh_looptri(&data->shape_bvh, dm, 0.0f, 4, 8);
+	return (bvhtree_from_mesh_looptri(&data->shape_bvh, dm, 0.0f, 4, 8) != NULL);
 }
 
 static void PE_free_shape_tree(PEData *data)




More information about the Bf-blender-cvs mailing list