Blender Git Loki
Git Commits -> Revision 8e3b221
Revision 8e3b221 by Daniel Genrich (smoke2) May 22, 2012, 23:44 (GMT) |
Bring branch into sync with turnk again, some files were missed in past merges |
Commit Details:
Full Hash: 8e3b221aaa867f1aa5587f6b9d7d78a28fe0fecb
SVN Revision: 46916
Parent Commit: 483d438
Lines Changed: +814, -817
132 Modified Paths:
/intern/audaspace/intern/AUD_Reference.h (+2, -2) (Diff)
/intern/cycles/blender/blender_object.cpp (+18, -18) (Diff)
/intern/cycles/device/device_cuda.cpp (+5, -5) (Diff)
/intern/cycles/kernel/kernel_passes.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_path.h (+2, -2) (Diff)
/intern/cycles/render/mesh.cpp (+1, -1) (Diff)
/intern/cycles/render/nodes.cpp (+1, -1) (Diff)
/intern/cycles/render/object.cpp (+7, -7) (Diff)
/intern/elbeem/intern/solver_init.cpp (+6, -9) (Diff)
/intern/guardedalloc/cpp/mallocn.cpp (+1, -1) (Diff)
/source/blender/avi/intern/endian.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_displist.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_ocean.h (+4, -4) (Diff)
/source/blender/blenkernel/BKE_utildefines.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/anim.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/brush.c (+5, -5) (Diff)
/source/blender/blenkernel/intern/camera.c (+4, -4) (Diff)
/source/blender/blenkernel/intern/constraint.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/customdata.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/displist.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/group.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/image.c (+4, -4) (Diff)
/source/blender/blenkernel/intern/mesh.c (+5, -5) (Diff)
/source/blender/blenkernel/intern/screen.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/softbody.c (+6, -6) (Diff)
/source/blender/blenkernel/intern/text.c (+8, -8) (Diff)
/source/blender/blenlib/BLI_bitmap.h (+1, -1) (Diff)
/source/blender/blenlib/BLI_memarena.h (+1, -1) (Diff)
/source/blender/blenlib/intern/pbvh.c (+9, -9) (Diff)
/source/blender/blenlib/intern/voxel.c (+3, -3) (Diff)
/source/blender/blenlib/intern/winstuff.c (+4, -4) (Diff)
/source/blender/blenlib/PIL_time.h (+1, -1) (Diff)
/source/blender/blenpluginapi/floatpatch.h (+1, -1) (Diff)
/source/blender/bmesh/intern/bmesh_interp.c (+3, -3) (Diff)
/source/blender/bmesh/intern/bmesh_mesh.c (+7, -7) (Diff)
/source/blender/bmesh/intern/bmesh_mods.c (+1, -1) (Diff)
/source/blender/bmesh/intern/bmesh_operators.c (+3, -3) (Diff)
/source/blender/bmesh/intern/bmesh_private.h (+7, -7) (Diff)
/source/blender/bmesh/operators/bmo_bevel.c (+7, -7) (Diff)
/source/blender/bmesh/operators/bmo_create.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_extrude.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_primitive.c (+175, -175) (Diff)
/source/blender/bmesh/operators/bmo_removedoubles.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_subdivide.c (+3, -3) (Diff)
/source/blender/bmesh/operators/bmo_triangulate.c (+5, -5) (Diff)
/source/blender/bmesh/operators/bmo_wireframe.c (+3, -3) (Diff)
/source/blender/collada/AnimationImporter.cpp (+2, -2) (Diff)
/source/blender/collada/AnimationImporter.h (+2, -2) (Diff)
/source/blender/collada/CameraExporter.cpp (+2, -2) (Diff)
/source/blender/collada/DocumentImporter.cpp (+16, -16) (Diff)
/source/blender/collada/MeshImporter.cpp (+2, -2) (Diff)
/source/blender/editors/armature/poseobject.c (+4, -4) (Diff)
/source/blender/editors/include/ED_particle.h (+1, -1) (Diff)
/source/blender/editors/include/ED_physics.h (+1, -1) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+4, -4) (Diff)
/source/blender/editors/physics/particle_edit.c (+1, -1) (Diff)
/source/blender/editors/render/render_preview.c (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_vertex.c (+14, -14) (Diff)
/source/blender/editors/sculpt_paint/sculpt.c (+2, -2) (Diff)
/source/blender/editors/sound/sound_ops.c (+3, -3) (Diff)
/source/blender/editors/space_clip/clip_buttons.c (+7, -7) (Diff)
/source/blender/editors/space_clip/clip_editor.c (+3, -3) (Diff)
/source/blender/editors/space_clip/clip_graph_draw.c (+4, -4) (Diff)
/source/blender/editors/space_clip/clip_graph_ops.c (+5, -5) (Diff)
/source/blender/editors/space_clip/clip_ops.c (+15, -15) (Diff)
/source/blender/editors/space_clip/clip_utils.c (+1, -1) (Diff)
/source/blender/editors/space_info/info_stats.c (+1, -1) (Diff)
/source/blender/editors/space_node/drawnode.c (+54, -54) (Diff)
/source/blender/editors/space_node/node_draw.c (+1, -1) (Diff)
/source/blender/editors/space_sequencer/sequencer_scopes.c (+1, -1) (Diff)
/source/blender/editors/space_text/space_text.c (+3, -3) (Diff)
/source/blender/editors/space_view3d/drawanimviz.c (+2, -2) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+12, -12) (Diff)
/source/blender/editors/space_view3d/view3d_edit.c (+5, -5) (Diff)
/source/blender/editors/space_view3d/view3d_ops.c (+1, -1) (Diff)
/source/blender/editors/transform/transform.c (+1, -1) (Diff)
/source/blender/editors/transform/transform_conversions.c (+2, -2) (Diff)
/source/blender/editors/transform/transform_generics.c (+2, -2) (Diff)
/source/blender/editors/uvedit/uvedit_ops.c (+2, -2) (Diff)
/source/blender/editors/uvedit/uvedit_smart_stitch.c (+2, -2) (Diff)
/source/blender/editors/uvedit/uvedit_unwrap_ops.c (+4, -4) (Diff)
/source/blender/gpu/CMakeLists.txt (+1, -1) (Diff)
/source/blender/gpu/intern/gpu_material.c (+26, -26) (Diff)
/source/blender/imbuf/intern/dds/ColorBlock.h (+3, -3) (Diff)
/source/blender/imbuf/intern/dds/DirectDrawSurface.h (+9, -9) (Diff)
/source/blender/imbuf/intern/moviecache.c (+4, -4) (Diff)
/source/blender/imbuf/intern/tiff.c (+4, -4) (Diff)
/source/blender/makesdna/DNA_boid_types.h (+1, -1) (Diff)
/source/blender/makesdna/DNA_ID.h (+1, -1) (Diff)
/source/blender/makesdna/DNA_image_types.h (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+32, -32) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_screen.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_test.c (+2, -2) (Diff)
/source/blender/modifiers/intern/MOD_boolean_util.c (+5, -5) (Diff)
/source/blender/modifiers/intern/MOD_cloth.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_collision.c (+3, -3) (Diff)
/source/blender/modifiers/intern/MOD_hook.c (+8, -8) (Diff)
/source/blender/modifiers/intern/MOD_mask.c (+5, -5) (Diff)
/source/blender/modifiers/intern/MOD_mirror.c (+3, -3) (Diff)
/source/blender/modifiers/intern/MOD_solidify.c (+7, -7) (Diff)
/source/blender/modifiers/intern/MOD_warp.c (+2, -2) (Diff)
/source/blender/modifiers/intern/MOD_weightvgproximity.c (+2, -2) (Diff)
/source/blender/nodes/composite/nodes/node_composite_blur.c (+21, -21) (Diff)
/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c (+25, -25) (Diff)
/source/blender/nodes/composite/nodes/node_composite_colorMatte.c (+1, -1) (Diff)
/source/blender/nodes/composite/nodes/node_composite_colorSpill.c (+2, -2) (Diff)
/source/blender/nodes/composite/nodes/node_composite_diffMatte.c (+37, -37) (Diff)
/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c (+42, -42) (Diff)
/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c (+3, -3) (Diff)
/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c (+8, -8) (Diff)
/source/blender/nodes/shader/nodes/node_shader_valToRgb.c (+4, -4) (Diff)
/source/blender/python/bmesh/bmesh_py_types.h (+2, -2) (Diff)
/source/blender/python/bmesh/bmesh_py_types_customdata.c (+1, -1) (Diff)
/source/blender/python/mathutils/mathutils.h (+1, -1) (Diff)
/source/blender/python/mathutils/mathutils_Euler.h (+1, -1) (Diff)
/source/blender/python/mathutils/mathutils_geometry.h (+1, -1) (Diff)
/source/blender/python/mathutils/mathutils_Quaternion.h (+1, -1) (Diff)
/source/blender/render/intern/include/occlusion.h (+1, -1) (Diff)
/source/blender/render/intern/source/convertblender.c (+1, -1) (Diff)
/source/blender/render/intern/source/envmap.c (+1, -1) (Diff)
/source/blender/render/intern/source/external_engine.c (+1, -1) (Diff)
/source/blender/render/intern/source/occlusion.c (+1, -1) (Diff)
/source/blender/render/intern/source/pipeline.c (+1, -1) (Diff)
/source/blender/render/intern/source/render_result.c (+1, -1) (Diff)
/source/blender/render/intern/source/sunsky.c (+1, -1) (Diff)
/source/blender/render/intern/source/voxeldata.c (+2, -2) (Diff)
/source/blender/windowmanager/intern/wm_keymap.c (+10, -10) (Diff)
/source/blender/windowmanager/intern/wm_operators.c (+1, -1) (Diff)
/source/gameengine/Converter/KX_ConvertProperties.h (+4, -4) (Diff)
/source/gameengine/Ketsji/KX_PythonSeq.h (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_IRasterizer.h (+1, -1) (Diff)
/intern/cycles/blender/blender_object.cpp (+18, -18) (Diff)
/intern/cycles/device/device_cuda.cpp (+5, -5) (Diff)
/intern/cycles/kernel/kernel_passes.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_path.h (+2, -2) (Diff)
/intern/cycles/render/mesh.cpp (+1, -1) (Diff)
/intern/cycles/render/nodes.cpp (+1, -1) (Diff)
/intern/cycles/render/object.cpp (+7, -7) (Diff)
/intern/elbeem/intern/solver_init.cpp (+6, -9) (Diff)
/intern/guardedalloc/cpp/mallocn.cpp (+1, -1) (Diff)
/source/blender/avi/intern/endian.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_displist.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_ocean.h (+4, -4) (Diff)
/source/blender/blenkernel/BKE_utildefines.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/anim.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/brush.c (+5, -5) (Diff)
/source/blender/blenkernel/intern/camera.c (+4, -4) (Diff)
/source/blender/blenkernel/intern/constraint.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/customdata.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/displist.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/group.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/image.c (+4, -4) (Diff)
/source/blender/blenkernel/intern/mesh.c (+5, -5) (Diff)
/source/blender/blenkernel/intern/screen.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/softbody.c (+6, -6) (Diff)
/source/blender/blenkernel/intern/text.c (+8, -8) (Diff)
/source/blender/blenlib/BLI_bitmap.h (+1, -1) (Diff)
/source/blender/blenlib/BLI_memarena.h (+1, -1) (Diff)
/source/blender/blenlib/intern/pbvh.c (+9, -9) (Diff)
/source/blender/blenlib/intern/voxel.c (+3, -3) (Diff)
/source/blender/blenlib/intern/winstuff.c (+4, -4) (Diff)
/source/blender/blenlib/PIL_time.h (+1, -1) (Diff)
/source/blender/blenpluginapi/floatpatch.h (+1, -1) (Diff)
/source/blender/bmesh/intern/bmesh_interp.c (+3, -3) (Diff)
/source/blender/bmesh/intern/bmesh_mesh.c (+7, -7) (Diff)
/source/blender/bmesh/intern/bmesh_mods.c (+1, -1) (Diff)
/source/blender/bmesh/intern/bmesh_operators.c (+3, -3) (Diff)
/source/blender/bmesh/intern/bmesh_private.h (+7, -7) (Diff)
/source/blender/bmesh/operators/bmo_bevel.c (+7, -7) (Diff)
/source/blender/bmesh/operators/bmo_create.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_extrude.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_primitive.c (+175, -175) (Diff)
/source/blender/bmesh/operators/bmo_removedoubles.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_subdivide.c (+3, -3) (Diff)
/source/blender/bmesh/operators/bmo_triangulate.c (+5, -5) (Diff)
/source/blender/bmesh/operators/bmo_wireframe.c (+3, -3) (Diff)
/source/blender/collada/AnimationImporter.cpp (+2, -2) (Diff)
/source/blender/collada/AnimationImporter.h (+2, -2) (Diff)
/source/blender/collada/CameraExporter.cpp (+2, -2) (Diff)
/source/blender/collada/DocumentImporter.cpp (+16, -16) (Diff)
/source/blender/collada/MeshImporter.cpp (+2, -2) (Diff)
/source/blender/editors/armature/poseobject.c (+4, -4) (Diff)
/source/blender/editors/include/ED_particle.h (+1, -1) (Diff)
/source/blender/editors/include/ED_physics.h (+1, -1) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+4, -4) (Diff)
/source/blender/editors/physics/particle_edit.c (+1, -1) (Diff)
/source/blender/editors/render/render_preview.c (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_vertex.c (+14, -14) (Diff)
/source/blender/editors/sculpt_paint/sculpt.c (+2, -2) (Diff)
/source/blender/editors/sound/sound_ops.c (+3, -3) (Diff)
/source/blender/editors/space_clip/clip_buttons.c (+7, -7) (Diff)
/source/blender/editors/space_clip/clip_editor.c (+3, -3) (Diff)
/source/blender/editors/space_clip/clip_graph_draw.c (+4, -4) (Diff)
/source/blender/editors/space_clip/clip_graph_ops.c (+5, -5) (Diff)
/source/blender/editors/space_clip/clip_ops.c (+15, -15) (Diff)
/source/blender/editors/space_clip/clip_utils.c (+1, -1) (Diff)
/source/blender/editors/space_info/info_stats.c (+1, -1) (Diff)
/source/blender/editors/space_node/drawnode.c (+54, -54) (Diff)
/source/blender/editors/space_node/node_draw.c (+1, -1) (Diff)
/source/blender/editors/space_sequencer/sequencer_scopes.c (+1, -1) (Diff)
/source/blender/editors/space_text/space_text.c (+3, -3) (Diff)
/source/blender/editors/space_view3d/drawanimviz.c (+2, -2) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+12, -12) (Diff)
/source/blender/editors/space_view3d/view3d_edit.c (+5, -5) (Diff)
/source/blender/editors/space_view3d/view3d_ops.c (+1, -1) (Diff)
/source/blender/editors/transform/transform.c (+1, -1) (Diff)
/source/blender/editors/transform/transform_conversions.c (+2, -2) (Diff)
/source/blender/editors/transform/transform_generics.c (+2, -2) (Diff)
/source/blender/editors/uvedit/uvedit_ops.c (+2, -2) (Diff)
/source/blender/editors/uvedit/uvedit_smart_stitch.c (+2, -2) (Diff)
/source/blender/editors/uvedit/uvedit_unwrap_ops.c (+4, -4) (Diff)
/source/blender/gpu/CMakeLists.txt (+1, -1) (Diff)
/source/blender/gpu/intern/gpu_material.c (+26, -26) (Diff)
/source/blender/imbuf/intern/dds/ColorBlock.h (+3, -3) (Diff)
/source/blender/imbuf/intern/dds/DirectDrawSurface.h (+9, -9) (Diff)
/source/blender/imbuf/intern/moviecache.c (+4, -4) (Diff)
/source/blender/imbuf/intern/tiff.c (+4, -4) (Diff)
/source/blender/makesdna/DNA_boid_types.h (+1, -1) (Diff)
/source/blender/makesdna/DNA_ID.h (+1, -1) (Diff)
/source/blender/makesdna/DNA_image_types.h (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+32, -32) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_screen.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_test.c (+2, -2) (Diff)
/source/blender/modifiers/intern/MOD_boolean_util.c (+5, -5) (Diff)
/source/blender/modifiers/intern/MOD_cloth.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_collision.c (+3, -3) (Diff)
/source/blender/modifiers/intern/MOD_hook.c (+8, -8) (Diff)
/source/blender/modifiers/intern/MOD_mask.c (+5, -5) (Diff)
/source/blender/modifiers/intern/MOD_mirror.c (+3, -3) (Diff)
/source/blender/modifiers/intern/MOD_solidify.c (+7, -7) (Diff)
/source/blender/modifiers/intern/MOD_warp.c (+2, -2) (Diff)
/source/blender/modifiers/intern/MOD_weightvgproximity.c (+2, -2) (Diff)
/source/blender/nodes/composite/nodes/node_composite_blur.c (+21, -21) (Diff)
/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c (+25, -25) (Diff)
/source/blender/nodes/composite/nodes/node_composite_colorMatte.c (+1, -1) (Diff)
/source/blender/nodes/composite/nodes/node_composite_colorSpill.c (+2, -2) (Diff)
/source/blender/nodes/composite/nodes/node_composite_diffMatte.c (+37, -37) (Diff)
/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c (+42, -42) (Diff)
/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c (+3, -3) (Diff)
/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c (+8, -8) (Diff)
/source/blender/nodes/shader/nodes/node_shader_valToRgb.c (+4, -4) (Diff)
/source/blender/python/bmesh/bmesh_py_types.h (+2, -2) (Diff)
/source/blender/python/bmesh/bmesh_py_types_customdata.c (+1, -1) (Diff)
/source/blender/python/mathutils/mathutils.h (+1, -1) (Diff)
/source/blender/python/mathutils/mathutils_Euler.h (+1, -1) (Diff)
/source/blender/python/mathutils/mathutils_geometry.h (+1, -1) (Diff)
/source/blender/python/mathutils/mathutils_Quaternion.h (+1, -1) (Diff)
/source/blender/render/intern/include/occlusion.h (+1, -1) (Diff)
/source/blender/render/intern/source/convertblender.c (+1, -1) (Diff)
/source/blender/render/intern/source/envmap.c (+1, -1) (Diff)
/source/blender/render/intern/source/external_engine.c (+1, -1) (Diff)
/source/blender/render/intern/source/occlusion.c (+1, -1) (Diff)
/source/blender/render/intern/source/pipeline.c (+1, -1) (Diff)
/source/blender/render/intern/source/render_result.c (+1, -1) (Diff)
/source/blender/render/intern/source/sunsky.c (+1, -1) (Diff)
/source/blender/render/intern/source/voxeldata.c (+2, -2) (Diff)
/source/blender/windowmanager/intern/wm_keymap.c (+10, -10) (Diff)
/source/blender/windowmanager/intern/wm_operators.c (+1, -1) (Diff)
/source/gameengine/Converter/KX_ConvertProperties.h (+4, -4) (Diff)
/source/gameengine/Ketsji/KX_PythonSeq.h (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_IRasterizer.h (+1, -1) (Diff)