[Bf-blender-cvs] [617557b] master: Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
Campbell Barton
noreply at git.blender.org
Tue Apr 1 06:26:44 CEST 2014
Commit: 617557b08ea94e2b65a1697ddf0b79651204d92b
Author: Campbell Barton
Date: Tue Apr 1 11:34:00 2014 +1100
https://developer.blender.org/rB617557b08ea94e2b65a1697ddf0b79651204d92b
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
===================================================================
M CMakeLists.txt
M SConstruct
M source/blender/avi/intern/avi_mjpeg.c
M source/blender/blenfont/BLF_api.h
M source/blender/blenkernel/BKE_addon.h
M source/blender/blenkernel/BKE_armature.h
M source/blender/blenkernel/BKE_camera.h
M source/blender/blenkernel/BKE_colortools.h
M source/blender/blenkernel/BKE_constraint.h
M source/blender/blenkernel/BKE_context.h
M source/blender/blenkernel/BKE_curve.h
M source/blender/blenkernel/BKE_depsgraph.h
M source/blender/blenkernel/BKE_image.h
M source/blender/blenkernel/BKE_material.h
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/BKE_object.h
M source/blender/blenkernel/BKE_paint.h
M source/blender/blenkernel/BKE_particle.h
M source/blender/blenkernel/BKE_pbvh.h
M source/blender/blenkernel/BKE_pointcache.h
M source/blender/blenkernel/BKE_report.h
M source/blender/blenkernel/BKE_text.h
M source/blender/blenkernel/BKE_texture.h
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/blenkernel/intern/action.c
M source/blender/blenkernel/intern/addon.c
M source/blender/blenkernel/intern/anim_sys.c
M source/blender/blenkernel/intern/armature.c
M source/blender/blenkernel/intern/blender.c
M source/blender/blenkernel/intern/brush.c
M source/blender/blenkernel/intern/camera.c
M source/blender/blenkernel/intern/cdderivedmesh.c
M source/blender/blenkernel/intern/colortools.c
M source/blender/blenkernel/intern/constraint.c
M source/blender/blenkernel/intern/context.c
M source/blender/blenkernel/intern/curve.c
M source/blender/blenkernel/intern/deform.c
M source/blender/blenkernel/intern/depsgraph.c
M source/blender/blenkernel/intern/displist.c
M source/blender/blenkernel/intern/dynamicpaint.c
M source/blender/blenkernel/intern/editderivedmesh.c
M source/blender/blenkernel/intern/fcurve.c
M source/blender/blenkernel/intern/font.c
M source/blender/blenkernel/intern/group.c
M source/blender/blenkernel/intern/idprop.c
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/key.c
M source/blender/blenkernel/intern/lamp.c
M source/blender/blenkernel/intern/lattice.c
M source/blender/blenkernel/intern/mask_rasterize.c
M source/blender/blenkernel/intern/material.c
M source/blender/blenkernel/intern/mball.c
M source/blender/blenkernel/intern/mesh.c
M source/blender/blenkernel/intern/mesh_validate.c
M source/blender/blenkernel/intern/modifiers_bmesh.c
M source/blender/blenkernel/intern/movieclip.c
M source/blender/blenkernel/intern/multires.c
M source/blender/blenkernel/intern/node.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/object_deform.c
M source/blender/blenkernel/intern/ocean.c
M source/blender/blenkernel/intern/packedFile.c
M source/blender/blenkernel/intern/paint.c
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/pbvh.c
M source/blender/blenkernel/intern/pbvh_bmesh.c
M source/blender/blenkernel/intern/pointcache.c
M source/blender/blenkernel/intern/report.c
M source/blender/blenkernel/intern/rigidbody.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenkernel/intern/screen.c
M source/blender/blenkernel/intern/seqeffects.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/blenkernel/intern/shrinkwrap.c
M source/blender/blenkernel/intern/smoke.c
M source/blender/blenkernel/intern/softbody.c
M source/blender/blenkernel/intern/speaker.c
M source/blender/blenkernel/intern/subsurf_ccg.c
M source/blender/blenkernel/intern/text.c
M source/blender/blenkernel/intern/texture.c
M source/blender/blenkernel/intern/tracking.c
M source/blender/blenkernel/intern/tracking_solver.c
M source/blender/blenkernel/intern/tracking_stabilize.c
M source/blender/blenkernel/intern/unit.c
M source/blender/blenkernel/intern/world.c
M source/blender/blenkernel/intern/writeffmpeg.c
M source/blender/blenkernel/intern/writeframeserver.c
M source/blender/blenlib/BLI_math_matrix.h
M source/blender/blenlib/BLI_stack.h
M source/blender/blenlib/BLI_sys_types.h
M source/blender/blenlib/intern/BLI_args.c
M source/blender/blenlib/intern/BLI_kdopbvh.c
M source/blender/blenlib/intern/fileops.c
M source/blender/blenlib/intern/freetypefont.c
M source/blender/blenlib/intern/math_matrix.c
M source/blender/blenlib/intern/string_cursor_utf8.c
M source/blender/blenlib/intern/uvproject.c
M source/blender/blenlib/intern/voronoi.c
M source/blender/blenlib/intern/winstuff.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_250.c
M source/blender/blenloader/intern/versioning_260.c
M source/blender/blenloader/intern/writefile.c
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/collada/ArmatureImporter.cpp
M source/blender/collada/collada_utils.cpp
M source/blender/compositor/intern/COM_ExecutionSystemHelper.h
M source/blender/compositor/intern/COM_compositor.cpp
M source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
M source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
M source/blender/compositor/operations/COM_MapRangeOperation.cpp
M source/blender/compositor/operations/COM_MaskOperation.cpp
M source/blender/compositor/operations/COM_OutputFileOperation.cpp
M source/blender/compositor/operations/COM_PreviewOperation.cpp
M source/blender/editors/animation/anim_channels_defines.c
M source/blender/editors/animation/anim_channels_edit.c
M source/blender/editors/animation/anim_deps.c
M source/blender/editors/animation/anim_filter.c
M source/blender/editors/animation/anim_markers.c
M source/blender/editors/animation/anim_ops.c
M source/blender/editors/animation/drivers.c
M source/blender/editors/animation/fmodifier_ui.c
M source/blender/editors/animation/keyframing.c
M source/blender/editors/animation/keyingsets.c
M source/blender/editors/armature/armature_add.c
M source/blender/editors/armature/armature_edit.c
M source/blender/editors/armature/armature_ops.c
M source/blender/editors/armature/armature_select.c
M source/blender/editors/armature/armature_skinning.c
M source/blender/editors/armature/editarmature_generate.c
M source/blender/editors/armature/editarmature_retarget.c
M source/blender/editors/armature/meshlaplacian.c
M source/blender/editors/armature/pose_edit.c
M source/blender/editors/armature/pose_group.c
M source/blender/editors/armature/pose_select.c
M source/blender/editors/armature/pose_slide.c
M source/blender/editors/armature/pose_transform.c
M source/blender/editors/armature/reeb.c
M source/blender/editors/curve/curve_ops.c
M source/blender/editors/curve/editcurve.c
M source/blender/editors/curve/editfont.c
M source/blender/editors/gpencil/drawgpencil.c
M source/blender/editors/gpencil/gpencil_buttons.c
M source/blender/editors/gpencil/gpencil_edit.c
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/include/ED_keyframing.h
M source/blender/editors/include/ED_mesh.h
M source/blender/editors/include/ED_view3d.h
M source/blender/editors/io/io_collada.c
M source/blender/editors/mask/mask_edit.c
M source/blender/editors/mask/mask_ops.c
M source/blender/editors/mask/mask_select.c
M source/blender/editors/mask/mask_shapekey.c
M source/blender/editors/mesh/editmesh_path.c
M source/blender/editors/mesh/editmesh_select.c
M source/blender/editors/metaball/mball_ops.c
M source/blender/editors/object/object_add.c
M source/blender/editors/object/object_bake.c
M source/blender/editors/object/object_constraint.c
M source/blender/editors/object/object_edit.c
M source/blender/editors/object/object_hook.c
M source/blender/editors/object/object_lattice.c
M source/blender/editors/object/object_modifier.c
M source/blender/editors/object/object_ops.c
M source/blender/editors/object/object_relations.c
M source/blender/editors/object/object_select.c
M source/blender/editors/object/object_transform.c
M source/blender/editors/physics/dynamicpaint_ops.c
M source/blender/editors/physics/particle_edit.c
M source/blender/editors/physics/particle_object.c
M source/blender/editors/physics/physics_fluid.c
M source/blender/editors/physics/physics_ops.c
M source/blender/editors/physics/physics_pointcache.c
M source/blender/editors/render/render_internal.c
M source/blender/editors/render/render_opengl.c
M source/blender/editors/render/render_preview.c
M source/blender/editors/render/render_shading.c
M source/blender/editors/render/render_update.c
M source/blender/editors/render/render_view.c
M source/blender/editors/screen/area.c
M source/blender/editors/screen/screen_edit.c
M source/blender/editors/screen/screen_intern.h
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/screen/screendump.c
M source/blender/editors/sculpt_paint/paint_image.c
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/editors/sculpt_paint/paint_ops.c
M source/blender/editors/sculpt_paint/paint_stroke.c
M source/blender/editors/sculpt_paint/paint_utils.c
M source/blender/editors/sculpt_paint/paint_vertex.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/sculpt_paint/sculpt_undo.c
M source/blender/editors/sound/sound_ops.c
M source/blender/editors/space_action/action_edit.c
M source/blender/editors/space_action/action_ops.c
M source/blender/editors/space_action/action_select.c
M source/blender/editors/space_buttons/buttons_context.c
M source/blender/editors/space_clip/clip_buttons.c
M source/blender/editors/space_clip/clip_dopesheet_ops.c
M source/blender/editors/space_clip/clip_editor.c
M source/blender/editors/space_clip/clip_graph_ops.c
M source/blender/editors/space_clip/clip_ops.c
M source/blender/editors/space_clip/clip_toolbar.c
M source/blender/editors/space_clip/clip_utils.c
M source/blender/editors/space_clip/space_clip.c
M source/blender/editors/space_clip/tracking_ops.c
M source/blender/editors/space_clip/tracking_select.c
M source/blender/editors/space_console/console_ops.c
M source/blender/editors/space_console/space_console.c
M source/blender/editors/space_file/file_ops.c
M source/blender/editors/space_file/file_panels.c
M source/blender/editors/space_file/filelist.c
M source/blender/editors/space_file/filesel.c
M source/blender/editors/space_file/fsmenu.c
M source/blender/editors/space_file/space_file.c
M source/blender/editors/space_graph/graph_buttons.c
M source/blender/editors/space_graph/graph_draw.c
M source/blender/editors/space_graph/graph_edit.c
M source/blender/editors/space_graph/graph_intern.h
M source/blender/editors/space_graph/graph_ops.c
M source/blender/editors/space_graph/graph_select.c
M source/blender/editors/space_graph/space_graph.c
M source/blender/editors/space_image/image_buttons.c
M source/blender/editors/space_image/image_edit.c
M source/blender/editors/space_image/image_ops.c
M source/blender/editors/space_image/space_image.c
M source/blender/editors/space_info/info_draw.c
M source/blender/editors/space_info/info_report.c
M source/blender/editors/space_logic/logic_ops.c
M source/blender/editors/space_logic/logic_window.c
M source/blender/editors/space_nla/nla_buttons.c
M source/blender/editors/space_nla/nla_draw.c
M source/blender/editors/space_nla/nla_edit.c
M source/blender/editors/space_nla/nla_ops.c
M source/blender/editors/space_node/drawnode.c
M source/blender/editors/space_node/node_add.c
M source/blender/editors/space_node/node_buttons.c
M source/blender/editors/space_node/node_draw.c
M source/blender/editors/space_node/node_edit.c
M source/blender/editors/space_node/node_group.c
M source/blender/editors/space_node/node_ops.c
M source/blender/editors/space_node/node_relationships.c
M source/blender/editors/space_node/node_select.c
M source/blender/editors/space_node/node_templates.c
M source/blender/editors/space_node/node_view.c
M source/blender/editors/space_node/space_node.c
M source/blender/editors/space_outliner/outliner_edit.c
M source/blender/editors/space_outliner/outliner_ops.c
M source/blender/editors/space_outliner/outliner_select.c
M source/blender/editors/space_outliner/outliner_tools.c
M source/blender/editors/space_outliner/outliner_tree.c
M source/blender/editors/space_outliner/space_outliner.c
M source/blender/editors/space_sequencer/sequencer_add.c
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/editors/space_sequencer/sequencer_modifier.c
M source/blender/editors/space_sequencer/sequencer_ops.c
M source/blender/editors/space_sequencer/sequencer_select.c
M source/blender/editors/space_sequencer/sequencer_view.c
M source/blender/editors/space_sequencer/space_sequencer.c
M source/blender/editors/space_text/space_text.c
M source/blender/editors/space_text/text_autocomplete.c
M source/blender/editors/space_text/text_draw.c
M source/blender/editors/space_text/text_format.h
M source/blender/editors/space_text/text_format_lua.c
M source/blender/editors/space_text/text_format_osl.c
M source/blender/editors/space_text/text_format_py.c
M source/blender/editors/space_text/text_ops.c
M source/blender/editors/space_time/space_time.c
M source/blender/editors/space_view3d/drawobject.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/space_view3d/view3d_buttons.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/editors/space_view3d/view3d_header.c
M source/blender/editors/space_view3d/view3d_ops.c
M source/blender/editors/space_view3d/view3d_toolbar.c
M source/blender/editors/space_view3d/view3d_view.c
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform_conversions.c
M source/blender/editors/transform/transform_manipulator.c
M source/blender/editors/transform/transform_ops.c
M source/blender/editors/transform/transform_orientations.c
M source/blender/editors/util/ed_util.c
M source/blender/editors/util/editmode_undo.c
M source/blender/editors/util/undo.c
M source/blender/editors/uvedit/uvedit_draw.c
M source/blender/editors/uvedit/uvedit_ops.c
M source/blender/editors/uvedit/uvedit_parametrizer.c
M source/blender/editors/uvedit/uvedit_smart_stitch.c
M source/blender/editors/uvedit/uvedit_unwrap_ops.c
M source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
M source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h
M source/blender/freestyle/intern/stroke/Operators.cpp
M source/blender/freestyle/intern/view_map/BoxGrid.h
M source/blender/freestyle/intern/view_map/SphericalGrid.h
M source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
M source/blender/freestyle/intern/winged_edge/Curvature.cpp
M source/blender/gpu/GPU_buffers.h
M source/blender/gpu/GPU_draw.h
M source/blender/gpu/GPU_extensions.h
M source/blender/gpu/GPU_material.h
M source/blender/gpu/intern/gpu_buffers.c
M source/blender/gpu/intern/gpu_codegen.c
M source/blender/gpu/intern/gpu_draw.c
M source/blender/gpu/intern/gpu_extensions.c
M source/blender/gpu/intern/gpu_material.c
M source/blender/imbuf/IMB_imbuf.h
M source/blender/imbuf/intern/anim_movie.c
M source/blender/imbuf/intern/colormanagement.c
M source/blender/imbuf/intern/divers.c
M source/blender/imbuf/intern/imbuf.h
M source/blender/imbuf/intern/indexer.c
M source/blender/imbuf/intern/indexer_dv.c
M source/blender/imbuf/intern/jp2.c
M source/blender/imbuf/intern/jpeg.c
M source/blender/imbuf/intern/moviecache.c
M source/blender/imbuf/intern/scaling.c
M source/blender/imbuf/intern/targa.c
M source/blender/imbuf/intern/util.c
M source/blender/imbuf/intern/writeimage.c
M source/blender/makesrna/intern/makesrna.c
M source/blender/makesrna/intern/rna_ID.c
M source/blender/makesrna/intern/rna_access.c
M source/blender/makesrna/intern/rna_action.c
M source/blender/makesrna/intern/rna_animation.c
M source/blender/makesrna/intern/rna_armature_api.c
M source/blender/makesrna/intern/rna_color.c
M source/blender/makesrna/intern/rna_curve.c
M source/blender/makesrna/intern/rna_define.c
M source/blender/makesrna/intern/rna_dynamicpaint.c
M source/blender/makesrna/intern/rna_fcurve.c
M source/blender/makesrna/intern/rna_image.c
M source/blender/makesrna/intern/rna_linestyle.c
M source/blender/makesrna/intern/rna_main.c
M source/blender/makesrna/intern/rna_main_api.c
M source/blender/makesrna/intern/rna_mask.c
M source/blender/makesrna/intern/rna_meta.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/makesrna/intern/rna_object.c
M source/blender/makesrna/intern/rna_object_api.c
M source/blender/makesrna/intern/rna_pose.c
M source/blender/makesrna/intern/rna_rigidbody.c
M source/blender/makesrna/intern/rna_rna.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_scene_api.c
M source/blender/makesrna/intern/rna_screen.c
M source/blender/makesrna/intern/rna_sequencer.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_tracking.c
M source/blender/makesrna/intern/rna_ui.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/makesrna/intern/rna_vfont.c
M source/blender/makesrna/intern/rna_wm.c
M source/blender/makesrna/intern/rna_wm_api.c
M source/blender/modifiers/intern/MOD_mirror.c
M source/blender/modifiers/intern/MOD_ocean.c
M source/blender/modifiers/intern/MOD_skin.c
M source/blender/nodes/composite/nodes/node_composite_outputFile.c
M source/blender/nodes/intern/node_common.c
M source/blender/nodes/intern/node_exec.c
M source/blender/nodes/intern/node_exec.h
M source/blender/nodes/shader/node_shader_util.c
M source/blender/nodes/shader/nodes/node_shader_texture.c
M source/blender/nodes/texture/nodes/node_texture_output.c
M source/blender/python/generic/idprop_py_api.c
M source/blender/quicktime/apple/qtkit_import.m
M source/blender/render/extern/include/RE_pipeline.h
M source/blender/render/intern/include/initrender.h
M source/blender/render/intern/include/render_result.h
M source/blender/render/intern/include/renderdatabase.h
M source/blender/render/intern/raytrace/rayobject_octree.cpp
M source/blender/render/intern/source/convertblender.c
M source/blender/render/intern/source/envmap.c
M source/blender/render/intern/source/external_engine.c
M source/blender/render/intern/source/imagetexture.c
M source/blender/render/intern/source/initrender.c
M source/blender/render/intern/source/multires_bake.c
M source/blender/render/intern/source/pipeline.c
M source/blender/render/intern/source/pixelshading.c
M source/blender/render/intern/source/pointdensity.c
M source/blender/render/intern/source/rayshade.c
M source/blender/render/intern/source/render_result.c
M source/blender/render/intern/source/render_texture.c
M source/blender/render/intern/source/rendercore.c
M source/blender/render/intern/source/renderdatabase.c
M source/blender/render/intern/source/shadeoutput.c
M source/blender/render/intern/source/texture_ocean.c
M source/blender/render/intern/source/voxeldata.c
M source/blender/render/intern/source/zbuf.c
M source/blender/windowmanager/WM_types.h
M source/blender/windowmanager/intern/wm_draw.c
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_files.c
M source/blender/windowmanager/intern/wm_gesture.c
M source/blender/windowmanager/intern/wm_init_exit.c
M source/blender/windowmanager/intern/wm_jobs.c
M source/blender/windowmanager/intern/wm_keymap.c
M source/blender/windowmanager/intern/wm_operators.c
M source/blender/windowmanager/intern/wm_playanim.c
M source/blender/windowmanager/intern/wm_window.c
M source/blenderplayer/bad_level_call_stubs/stubs.c
M source/creator/creator.c
M source/gameengine/Converter/BL_ArmatureObject.cpp
M source/gameengine/Converter/BL_BlenderDataConversion.cpp
M source/gameengine/Expressions/IfExpr.cpp
M source/gameengine/GamePlayer/ghost/GPG_Application.cpp
M source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
M source/gameengine/Rasterizer/RAS_TexVert.cpp
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index db89daa..8b57251 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,9 +155,6 @@ mark_as_advanced(WITH_HEADLESS)
option(WITH_AUDASPACE "Build with blenders audio library (only disable if you know what you're doing!)" ON)
mark_as_advanced(WITH_AUDASPACE)
-option(WITH_BOOL_COMPAT "Continue defining \"TRUE\" and \"FALSE\" until these can be replaced with \"true\" and \"false\" from stdbool.h" ON)
-mark_as_advanced(WITH_BOOL_COMPAT)
-
# (unix defaults to OpenMP On)
if((UNIX AND NOT APPLE) OR (MINGW))
set(PLATFORM_DEFAULT ON)
@@ -509,9 +506,6 @@ TEST_STDBOOL_SUPPORT()
if(HAVE_STDBOOL_H)
add_definitions(-DHAVE_STDBOOL_H)
endif()
-if(WITH_BOOL_COMPAT)
- add_definitions(-DWITH_BOOL_COMPAT)
-endif()
#-----------------------------------------------------------------------------
# Check for valid directories
diff --git a/SConstruct b/SConstruct
index dde9d66..267e793 100644
--- a/SConstruct
+++ b/SConstruct
@@ -505,7 +505,6 @@ else:
env['CPPFLAGS'].append('-DWITH_AUDASPACE')
env['CPPFLAGS'].append('-DWITH_AVI')
env['CPPFLAGS'].append('-DWITH_OPENNL')
-env['CPPFLAGS'].append('-DWITH_BOOL_COMPAT')
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc') and env['MSVC_VERSION'] == '11.0':
env['CPPFLAGS'].append('-D_ALLOW_KEYWORD_MACROS')
diff --git a/source/blender/avi/intern/avi_mjpeg.c b/source/blender/avi/intern/avi_mjpeg.c
index a2d48c7..857501c 100644
--- a/source/blender/avi/intern/avi_mjpeg.c
+++ b/source/blender/avi/intern/avi_mjpeg.c
@@ -57,8 +57,8 @@ static void add_huff_table(j_decompress_ptr dinfo, JHUFF_TBL **htblptr, const UI
memcpy((*htblptr)->bits, bits, sizeof((*htblptr)->bits));
memcpy((*htblptr)->huffval, val, sizeof((*htblptr)->huffval));
- /* Initialize sent_table FALSE so table will be written to JPEG file. */
- (*htblptr)->sent_table = FALSE;
+ /* Initialize sent_table false so table will be written to JPEG file. */
+ (*htblptr)->sent_table = false;
}
/* Set up the standard Huffman tables (cf. JPEG standard section K.3) */
@@ -165,7 +165,7 @@ static int Decode_JPEG(unsigned char *inBuffer, unsigned char *outBuffer, unsign
dinfo.err = jpeg_std_error(&jerr);
jpeg_create_decompress(&dinfo);
jpegmemsrcmgr_build(&dinfo, inBuffer, bufsize);
- jpeg_read_header(&dinfo, TRUE);
+ jpeg_read_header(&dinfo, true);
if (dinfo.dc_huff_tbl_ptrs[0] == NULL) {
std_huff_tables(&dinfo);
}
@@ -187,7 +187,7 @@ static int Decode_JPEG(unsigned char *inBuffer, unsigned char *outBuffer, unsign
jpegmemsrcmgr_build(&dinfo, inBuffer, bufsize - numbytes);
numbytes = 0;
- jpeg_read_header(&dinfo, TRUE);
+ jpeg_read_header(&dinfo, true);
if (dinfo.dc_huff_tbl_ptrs[0] == NULL) {
std_huff_tables(&dinfo);
}
@@ -224,21 +224,21 @@ static void Compress_JPEG(int quality, unsigned char *outbuffer, const unsigned
jpeg_set_defaults(&cinfo);
jpeg_set_colorspace(&cinfo, JCS_YCbCr);
- jpeg_set_quality(&cinfo, quality, TRUE);
+ jpeg_set_quality(&cinfo, quality, true);
- cinfo.dc_huff_tbl_ptrs[0]->sent_table = TRUE;
- cinfo.dc_huff_tbl_ptrs[1]->sent_table = TRUE;
- cinfo.ac_huff_tbl_ptrs[0]->sent_table = TRUE;
- cinfo.ac_huff_tbl_ptrs[1]->sent_table = TRUE;
+ cinfo.dc_huff_tbl_ptrs[0]->sent_table = true;
+ cinfo.dc_huff_tbl_ptrs[1]->sent_table = true;
+ cinfo.ac_huff_tbl_ptrs[0]->sent_table = true;
+ cinfo.ac_huff_tbl_ptrs[1]->sent_table = true;
cinfo.comp_info[0].component_id = 0;
cinfo.comp_info[0].v_samp_factor = 1;
cinfo.comp_info[1].component_id = 1;
cinfo.comp_info[2].component_id = 2;
- cinfo.write_JFIF_header = FALSE;
+ cinfo.write_JFIF_header = false;
- jpeg_start_compress(&cinfo, FALSE);
+ jpeg_start_compress(&cinfo, false);
i = 0;
marker[i++] = 'A';
@@ -378,7 +378,7 @@ static void jpegmemdestmgr_init_destination(j_compress_ptr cinfo)
static boolean jpegmemdestmgr_empty_output_buffer(j_compress_ptr cinfo)
{
(void)cinfo; /* unused */
- return TRUE;
+ return true;
}
static void jpegmemdestmgr_term_destination(j_compress_ptr cinfo)
@@ -422,7 +422,7 @@ static boolean jpegmemsrcmgr_fill_input_buffer(j_decompress_ptr dinfo)
dinfo->src->next_input_byte = buf;
dinfo->src->bytes_in_buffer = 2;
- return TRUE;
+ return true;
}
static void jpegmemsrcmgr_skip_input_data(j_decompress_ptr dinfo, long skipcnt)
diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h
index e01631f..2a27a3d 100644
--- a/source/blender/blenfont/BLF_api.h
+++ b/source/blender/blenfont/BLF_api.h
@@ -154,11 +154,11 @@ void BLF_shadow_offset(int fontid, int x, int y);
/* Set the buffer, size and number of channels to draw, one thing to take care is call
* this function with NULL pointer when we finish, for example:
*
- * BLF_buffer(my_fbuf, my_cbuf, 100, 100, 4, TRUE, NULL);
+ * BLF_buffer(my_fbuf, my_cbuf, 100, 100, 4, true, NULL);
*
* ... set color, position and draw ...
*
- * BLF_buffer(NULL, NULL, NULL, 0, 0, FALSE, NULL);
+ * BLF_buffer(NULL, NULL, NULL, 0, 0, false, NULL);
*/
void BLF_buffer(int fontid, float *fbuf, unsigned char *cbuf, int w, int h, int nch, struct ColorManagedDisplay *display);
diff --git a/source/blender/blenkernel/BKE_addon.h b/source/blender/blenkernel/BKE_addon.h
index 739a4e3..9c09fff 100644
--- a/source/blender/blenkernel/BKE_addon.h
+++ b/source/blender/blenkernel/BKE_addon.h
@@ -36,7 +36,7 @@ typedef struct bAddonPrefType {
ExtensionRNA ext;
} bAddonPrefType;
-bAddonPrefType *BKE_addon_pref_type_find(const char *idname, int quiet);
+bAddonPrefType *BKE_addon_pref_type_find(const char *idname, bool quiet);
void BKE_addon_pref_type_add(bAddonPrefType *apt);
void BKE_addon_pref_type_remove(bAddonPrefType *apt);
diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h
index 60e03af..8532975 100644
--- a/source/blender/blenkernel/BKE_armature.h
+++ b/source/blender/blenkernel/BKE_armature.h
@@ -93,7 +93,7 @@ void BKE_armature_where_is(struct bArmature *arm);
void BKE_armature_where_is_bone(struct Bone *bone, struct Bone *prevbone);
void BKE_pose_rebuild(struct Object *ob, struct bArmature *arm);
void BKE_pose_where_is(struct Scene *scene, struct Object *ob);
-void BKE_pose_where_is_bone(struct Scene *scene, struct Object *ob, struct bPoseChannel *pchan, float ctime, int do_extra);
+void BKE_pose_where_is_bone(struct Scene *scene, struct Object *ob, struct bPoseChannel *pchan, float ctime, bool do_extra);
void BKE_pose_where_is_bone_tail(struct bPoseChannel *pchan);
/* get_objectspace_bone_matrix has to be removed still */
@@ -111,8 +111,8 @@ void BKE_armature_mat_pose_to_delta(float delta_mat[4][4], float pose_mat[4][4],
void BKE_armature_mat_pose_to_bone_ex(struct Object *ob, struct bPoseChannel *pchan, float inmat[4][4], float outmat[4][4]);
-void BKE_pchan_mat3_to_rot(struct bPoseChannel *pchan, float mat[3][3], short use_compat);
-void BKE_pchan_apply_mat4(struct bPoseChannel *pchan, float mat[4][4], short use_comat);
+void BKE_pchan_mat3_to_rot(struct bPoseChannel *pchan, float mat[3][3], bool use_compat);
+void BKE_pchan_apply_mat4(struct bPoseChannel *pchan, float mat[4][4], bool use_comat);
void BKE_pchan_to_mat4(struct bPoseChannel *pchan, float chan_mat[4][4]);
void BKE_pchan_calc_mat(struct bPoseChannel *pchan);
diff --git a/source/blender/blenkernel/BKE_camera.h b/source/blender/blenkernel/BKE_camera.h
index 49ba9c9..01b401c 100644
--- a/source/blender/blenkernel/BKE_camera.h
+++ b/source/blender/blenkernel/BKE_camera.h
@@ -69,7 +69,7 @@ float BKE_camera_sensor_size(int sensor_fit, float sensor_x, float sensor_y);
typedef struct CameraParams {
/* lens */
- int is_ortho;
+ bool is_ortho;
float lens;
float ortho_scale;
float zoom;
diff --git a/source/blender/blenkernel/BKE_colortools.h b/source/blender/blenkernel/BKE_colortools.h
index a69a960..9234625 100644
--- a/source/blender/blenkernel/BKE_colortools.h
+++ b/source/blender/blenkernel/BKE_colortools.h
@@ -55,7 +55,7 @@ void curvemapping_set_black_white(struct CurveMapping *cumap, con
#define CURVEMAP_SLOPE_POSITIVE 1
void curvemap_reset(struct CurveMap *cuma, const struct rctf *clipr, int preset, int slope);
void curvemap_remove(struct CurveMap *cuma, const short flag);
-int curvemap_remove_point(struct CurveMap *cuma, struct CurveMapPoint *cmp);
+bool curvemap_remove_point(struct CurveMap *cuma, struct CurveMapPoint *cmp);
struct CurveMapPoint *curvemap_insert(struct CurveMap *cuma, float x, float y);
void curvemap_sethandle(struct CurveMap *cuma, int type);
diff --git a/source/blender/blenkernel/BKE_constraint.h b/source/blender/blenkernel/BKE_constraint.h
index c79dc62..8a9d358 100644
--- a/source/blender/blenkernel/BKE_constraint.h
+++ b/source/blender/blenkernel/BKE_constraint.h
@@ -123,7 +123,7 @@ bConstraintTypeInfo *BKE_get_constraint_typeinfo(int type);
void BKE_unique_constraint_name(struct bConstraint *con, struct ListBase *list);
void BKE_free_constraints(struct ListBase *list);
-void BKE_copy_constraints(struct ListBase *dst, const struct ListBase *src, int do_extern);
+void BKE_copy_constraints(struct ListBase *dst, const struct ListBase *src, bool do_extern);
void BKE_relink_constraints(struct ListBase *list);
void BKE_id_loop_constraints(struct ListBase *list, ConstraintIDFunc func, void *userdata);
void BKE_free_constraint_data(struct bConstraint *con);
diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h
index 2834a37..877e376 100644
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@ -185,7 +185,7 @@ enum {
PointerRNA CTX_data_pointer_get(const bContext *C, const char *member);
PointerRNA CTX_data_pointer_get_type(const bContext *C, const char *member, StructRNA *type);
ListBase CTX_data_collection_get(const bContext *C, const char *member);
-ListBase CTX_data_dir_get_ex(const bContext *C, const short use_store, const short use_rna, const short use_all);
+ListBase CTX_data_dir_get_ex(const bContext *C, const bool use_store, const bool use_rna, const bool use_all);
ListBase
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list