[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46113] branches/smoke2: Merge trunk r46051-r46111
Daniel Genrich
daniel.genrich at gmx.net
Mon Apr 30 14:44:44 CEST 2012
Revision: 46113
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46113
Author: genscher
Date: 2012-04-30 12:44:43 +0000 (Mon, 30 Apr 2012)
Log Message:
-----------
Merge trunk r46051-r46111
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46051
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46111
Modified Paths:
--------------
branches/smoke2/CMakeLists.txt
branches/smoke2/build_files/scons/config/win32-vc-config.py
branches/smoke2/build_files/scons/config/win64-vc-config.py
branches/smoke2/intern/cycles/kernel/kernel_camera.h
branches/smoke2/intern/cycles/kernel/kernel_compat_opencl.h
branches/smoke2/intern/cycles/kernel/svm/svm_gamma.h
branches/smoke2/intern/cycles/util/util_boundbox.h
branches/smoke2/intern/cycles/util/util_math.h
branches/smoke2/intern/cycles/util/util_types.h
branches/smoke2/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/smoke2/intern/smoke/intern/smoke_API.cpp
branches/smoke2/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/smoke2/release/scripts/startup/bl_ui/properties_paint_common.py
branches/smoke2/release/scripts/startup/bl_ui/space_clip.py
branches/smoke2/release/scripts/startup/bl_ui/space_text.py
branches/smoke2/release/scripts/startup/bl_ui/space_view3d.py
branches/smoke2/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/smoke2/source/blender/avi/AVI_avi.h
branches/smoke2/source/blender/avi/intern/avi.c
branches/smoke2/source/blender/avi/intern/avirgb.c
branches/smoke2/source/blender/avi/intern/codecs.c
branches/smoke2/source/blender/avi/intern/endian.c
branches/smoke2/source/blender/avi/intern/options.c
branches/smoke2/source/blender/blenfont/intern/blf_glyph.c
branches/smoke2/source/blender/blenfont/intern/blf_lang.c
branches/smoke2/source/blender/blenkernel/BKE_blender.h
branches/smoke2/source/blender/blenkernel/BKE_brush.h
branches/smoke2/source/blender/blenkernel/BKE_cloth.h
branches/smoke2/source/blender/blenkernel/BKE_deform.h
branches/smoke2/source/blender/blenkernel/BKE_font.h
branches/smoke2/source/blender/blenkernel/BKE_library.h
branches/smoke2/source/blender/blenkernel/BKE_mesh.h
branches/smoke2/source/blender/blenkernel/BKE_node.h
branches/smoke2/source/blender/blenkernel/BKE_ocean.h
branches/smoke2/source/blender/blenkernel/BKE_softbody.h
branches/smoke2/source/blender/blenkernel/BKE_text.h
branches/smoke2/source/blender/blenkernel/depsgraph_private.h
branches/smoke2/source/blender/blenkernel/intern/DerivedMesh.c
branches/smoke2/source/blender/blenkernel/intern/action.c
branches/smoke2/source/blender/blenkernel/intern/anim.c
branches/smoke2/source/blender/blenkernel/intern/anim_sys.c
branches/smoke2/source/blender/blenkernel/intern/armature.c
branches/smoke2/source/blender/blenkernel/intern/blender.c
branches/smoke2/source/blender/blenkernel/intern/bmfont.c
branches/smoke2/source/blender/blenkernel/intern/boids.c
branches/smoke2/source/blender/blenkernel/intern/brush.c
branches/smoke2/source/blender/blenkernel/intern/bvhutils.c
branches/smoke2/source/blender/blenkernel/intern/camera.c
branches/smoke2/source/blender/blenkernel/intern/cdderivedmesh.c
branches/smoke2/source/blender/blenkernel/intern/cloth.c
branches/smoke2/source/blender/blenkernel/intern/collision.c
branches/smoke2/source/blender/blenkernel/intern/colortools.c
branches/smoke2/source/blender/blenkernel/intern/constraint.c
branches/smoke2/source/blender/blenkernel/intern/curve.c
branches/smoke2/source/blender/blenkernel/intern/customdata.c
branches/smoke2/source/blender/blenkernel/intern/deform.c
branches/smoke2/source/blender/blenkernel/intern/depsgraph.c
branches/smoke2/source/blender/blenkernel/intern/displist.c
branches/smoke2/source/blender/blenkernel/intern/dynamicpaint.c
branches/smoke2/source/blender/blenkernel/intern/editderivedmesh.c
branches/smoke2/source/blender/blenkernel/intern/effect.c
branches/smoke2/source/blender/blenkernel/intern/fcurve.c
branches/smoke2/source/blender/blenkernel/intern/fluidsim.c
branches/smoke2/source/blender/blenkernel/intern/fmodifier.c
branches/smoke2/source/blender/blenkernel/intern/font.c
branches/smoke2/source/blender/blenkernel/intern/gpencil.c
branches/smoke2/source/blender/blenkernel/intern/group.c
branches/smoke2/source/blender/blenkernel/intern/idcode.c
branches/smoke2/source/blender/blenkernel/intern/image.c
branches/smoke2/source/blender/blenkernel/intern/implicit.c
branches/smoke2/source/blender/blenkernel/intern/ipo.c
branches/smoke2/source/blender/blenkernel/intern/lattice.c
branches/smoke2/source/blender/blenkernel/intern/library.c
branches/smoke2/source/blender/blenkernel/intern/material.c
branches/smoke2/source/blender/blenkernel/intern/mball.c
branches/smoke2/source/blender/blenkernel/intern/modifier.c
branches/smoke2/source/blender/blenkernel/intern/movieclip.c
branches/smoke2/source/blender/blenkernel/intern/multires.c
branches/smoke2/source/blender/blenkernel/intern/navmesh_conversion.c
branches/smoke2/source/blender/blenkernel/intern/nla.c
branches/smoke2/source/blender/blenkernel/intern/node.c
branches/smoke2/source/blender/blenkernel/intern/object.c
branches/smoke2/source/blender/blenkernel/intern/ocean.c
branches/smoke2/source/blender/blenkernel/intern/packedFile.c
branches/smoke2/source/blender/blenkernel/intern/particle.c
branches/smoke2/source/blender/blenkernel/intern/particle_system.c
branches/smoke2/source/blender/blenkernel/intern/pointcache.c
branches/smoke2/source/blender/blenkernel/intern/scene.c
branches/smoke2/source/blender/blenkernel/intern/seqeffects.c
branches/smoke2/source/blender/blenkernel/intern/shrinkwrap.c
branches/smoke2/source/blender/blenkernel/intern/smoke.c
branches/smoke2/source/blender/blenkernel/intern/softbody.c
branches/smoke2/source/blender/blenkernel/intern/text.c
branches/smoke2/source/blender/blenkernel/intern/texture.c
branches/smoke2/source/blender/blenkernel/intern/unit.c
branches/smoke2/source/blender/blenkernel/intern/writeframeserver.c
branches/smoke2/source/blender/blenlib/BLI_fileops_types.h
branches/smoke2/source/blender/blenlib/BLI_ghash.h
branches/smoke2/source/blender/blenlib/BLI_math_geom.h
branches/smoke2/source/blender/blenlib/BLI_math_vector.h
branches/smoke2/source/blender/blenlib/BLI_path_util.h
branches/smoke2/source/blender/blenlib/BLI_utildefines.h
branches/smoke2/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/smoke2/source/blender/blenlib/intern/BLI_kdtree.c
branches/smoke2/source/blender/blenlib/intern/DLRB_tree.c
branches/smoke2/source/blender/blenlib/intern/fileops.c
branches/smoke2/source/blender/blenlib/intern/freetypefont.c
branches/smoke2/source/blender/blenlib/intern/jitter.c
branches/smoke2/source/blender/blenlib/intern/listbase.c
branches/smoke2/source/blender/blenlib/intern/math_matrix.c
branches/smoke2/source/blender/blenlib/intern/math_vector.c
branches/smoke2/source/blender/blenlib/intern/noise.c
branches/smoke2/source/blender/blenlib/intern/path_util.c
branches/smoke2/source/blender/blenlib/intern/storage.c
branches/smoke2/source/blender/blenlib/intern/string.c
branches/smoke2/source/blender/blenlib/intern/string_utf8.c
branches/smoke2/source/blender/blenlib/intern/threads.c
branches/smoke2/source/blender/blenlib/intern/winstuff.c
branches/smoke2/source/blender/blenloader/intern/readfile.c
branches/smoke2/source/blender/blenloader/intern/writefile.c
branches/smoke2/source/blender/blenpluginapi/iff.h
branches/smoke2/source/blender/blenpluginapi/intern/pluginapi.c
branches/smoke2/source/blender/bmesh/CMakeLists.txt
branches/smoke2/source/blender/bmesh/intern/bmesh_error.h
branches/smoke2/source/blender/bmesh/intern/bmesh_opdefines.c
branches/smoke2/source/blender/bmesh/intern/bmesh_operators_private.h
branches/smoke2/source/blender/bmesh/intern/bmesh_queries.c
branches/smoke2/source/blender/bmesh/intern/bmesh_queries.h
branches/smoke2/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/smoke2/source/blender/bmesh/operators/bmo_inset.c
branches/smoke2/source/blender/collada/AnimationExporter.cpp
branches/smoke2/source/blender/collada/AnimationExporter.h
branches/smoke2/source/blender/collada/AnimationImporter.cpp
branches/smoke2/source/blender/collada/AnimationImporter.h
branches/smoke2/source/blender/collada/ArmatureExporter.cpp
branches/smoke2/source/blender/collada/ArmatureImporter.cpp
branches/smoke2/source/blender/collada/ArmatureImporter.h
branches/smoke2/source/blender/collada/CameraExporter.cpp
branches/smoke2/source/blender/collada/DocumentImporter.cpp
branches/smoke2/source/blender/collada/EffectExporter.cpp
branches/smoke2/source/blender/collada/ErrorHandler.h
branches/smoke2/source/blender/collada/ExtraHandler.h
branches/smoke2/source/blender/collada/ExtraTags.h
branches/smoke2/source/blender/collada/LightExporter.cpp
branches/smoke2/source/blender/collada/TransformWriter.cpp
branches/smoke2/source/blender/editors/animation/anim_channels_defines.c
branches/smoke2/source/blender/editors/animation/anim_channels_edit.c
branches/smoke2/source/blender/editors/animation/anim_deps.c
branches/smoke2/source/blender/editors/animation/anim_draw.c
branches/smoke2/source/blender/editors/animation/anim_filter.c
branches/smoke2/source/blender/editors/animation/anim_ipo_utils.c
branches/smoke2/source/blender/editors/animation/anim_markers.c
branches/smoke2/source/blender/editors/animation/drivers.c
branches/smoke2/source/blender/editors/animation/fmodifier_ui.c
branches/smoke2/source/blender/editors/animation/keyframes_draw.c
branches/smoke2/source/blender/editors/animation/keyframes_general.c
branches/smoke2/source/blender/editors/animation/keyframing.c
branches/smoke2/source/blender/editors/animation/keyingsets.c
branches/smoke2/source/blender/editors/armature/armature_intern.h
branches/smoke2/source/blender/editors/armature/armature_ops.c
branches/smoke2/source/blender/editors/armature/editarmature.c
branches/smoke2/source/blender/editors/armature/editarmature_sketch.c
branches/smoke2/source/blender/editors/armature/meshlaplacian.c
branches/smoke2/source/blender/editors/armature/poseSlide.c
branches/smoke2/source/blender/editors/armature/poseUtils.c
branches/smoke2/source/blender/editors/armature/poselib.c
branches/smoke2/source/blender/editors/armature/poseobject.c
branches/smoke2/source/blender/editors/armature/reeb.c
branches/smoke2/source/blender/editors/curve/editcurve.c
branches/smoke2/source/blender/editors/gpencil/drawgpencil.c
branches/smoke2/source/blender/editors/gpencil/editaction_gpencil.c
branches/smoke2/source/blender/editors/gpencil/gpencil_edit.c
branches/smoke2/source/blender/editors/gpencil/gpencil_ops.c
branches/smoke2/source/blender/editors/gpencil/gpencil_paint.c
branches/smoke2/source/blender/editors/include/ED_clip.h
branches/smoke2/source/blender/editors/interface/interface.c
branches/smoke2/source/blender/editors/interface/interface_handlers.c
branches/smoke2/source/blender/editors/interface/interface_layout.c
branches/smoke2/source/blender/editors/mesh/editmesh_slide.c
branches/smoke2/source/blender/editors/mesh/editmesh_tools.c
branches/smoke2/source/blender/editors/mesh/mesh_intern.h
branches/smoke2/source/blender/editors/mesh/mesh_ops.c
branches/smoke2/source/blender/editors/mesh/meshtools.c
branches/smoke2/source/blender/editors/metaball/mball_edit.c
branches/smoke2/source/blender/editors/object/object_add.c
branches/smoke2/source/blender/editors/object/object_relations.c
branches/smoke2/source/blender/editors/object/object_vgroup.c
branches/smoke2/source/blender/editors/physics/particle_edit.c
branches/smoke2/source/blender/editors/physics/particle_object.c
branches/smoke2/source/blender/editors/physics/physics_fluid.c
branches/smoke2/source/blender/editors/render/render_opengl.c
branches/smoke2/source/blender/editors/screen/area.c
branches/smoke2/source/blender/editors/screen/glutil.c
branches/smoke2/source/blender/editors/screen/screen_ops.c
branches/smoke2/source/blender/editors/sculpt_paint/paint_ops.c
branches/smoke2/source/blender/editors/sculpt_paint/paint_vertex.c
branches/smoke2/source/blender/editors/space_action/action_edit.c
branches/smoke2/source/blender/editors/space_action/action_select.c
branches/smoke2/source/blender/editors/space_clip/clip_buttons.c
branches/smoke2/source/blender/editors/space_clip/clip_editor.c
branches/smoke2/source/blender/editors/space_clip/clip_graph_draw.c
branches/smoke2/source/blender/editors/space_clip/clip_graph_ops.c
branches/smoke2/source/blender/editors/space_clip/clip_intern.h
branches/smoke2/source/blender/editors/space_clip/clip_toolbar.c
branches/smoke2/source/blender/editors/space_clip/clip_utils.c
branches/smoke2/source/blender/editors/space_clip/space_clip.c
branches/smoke2/source/blender/editors/space_clip/tracking_ops.c
branches/smoke2/source/blender/editors/space_file/file_draw.c
branches/smoke2/source/blender/editors/space_file/file_intern.h
branches/smoke2/source/blender/editors/space_file/file_ops.c
branches/smoke2/source/blender/editors/space_file/file_panels.c
branches/smoke2/source/blender/editors/space_file/filelist.c
branches/smoke2/source/blender/editors/space_file/fsmenu.c
branches/smoke2/source/blender/editors/space_file/space_file.c
branches/smoke2/source/blender/editors/space_graph/graph_draw.c
branches/smoke2/source/blender/editors/space_graph/graph_edit.c
branches/smoke2/source/blender/editors/space_graph/graph_select.c
branches/smoke2/source/blender/editors/space_graph/graph_utils.c
branches/smoke2/source/blender/editors/space_graph/space_graph.c
branches/smoke2/source/blender/editors/space_logic/logic_ops.c
branches/smoke2/source/blender/editors/space_logic/logic_window.c
branches/smoke2/source/blender/editors/space_nla/nla_channels.c
branches/smoke2/source/blender/editors/space_nla/nla_draw.c
branches/smoke2/source/blender/editors/space_nla/nla_edit.c
branches/smoke2/source/blender/editors/space_nla/nla_ops.c
branches/smoke2/source/blender/editors/space_nla/nla_select.c
branches/smoke2/source/blender/editors/space_node/drawnode.c
branches/smoke2/source/blender/editors/space_node/node_draw.c
branches/smoke2/source/blender/editors/space_node/node_select.c
branches/smoke2/source/blender/editors/space_outliner/outliner_draw.c
branches/smoke2/source/blender/editors/space_outliner/outliner_edit.c
branches/smoke2/source/blender/editors/space_outliner/outliner_select.c
branches/smoke2/source/blender/editors/space_outliner/outliner_tools.c
branches/smoke2/source/blender/editors/space_outliner/outliner_tree.c
branches/smoke2/source/blender/editors/space_sequencer/sequencer_draw.c
branches/smoke2/source/blender/editors/space_sequencer/sequencer_intern.h
branches/smoke2/source/blender/editors/space_sequencer/space_sequencer.c
branches/smoke2/source/blender/editors/space_text/space_text.c
branches/smoke2/source/blender/editors/space_text/text_intern.h
branches/smoke2/source/blender/editors/space_text/text_ops.c
branches/smoke2/source/blender/editors/space_text/text_python.c
branches/smoke2/source/blender/editors/space_view3d/drawobject.c
branches/smoke2/source/blender/editors/space_view3d/drawvolume.c
branches/smoke2/source/blender/editors/space_view3d/view3d_buttons.c
branches/smoke2/source/blender/editors/transform/transform.c
branches/smoke2/source/blender/editors/transform/transform.h
branches/smoke2/source/blender/editors/transform/transform_constraints.c
branches/smoke2/source/blender/editors/transform/transform_conversions.c
branches/smoke2/source/blender/editors/transform/transform_generics.c
branches/smoke2/source/blender/editors/transform/transform_manipulator.c
branches/smoke2/source/blender/editors/transform/transform_ops.c
branches/smoke2/source/blender/editors/transform/transform_orientations.c
branches/smoke2/source/blender/editors/transform/transform_snap.c
branches/smoke2/source/blender/gpu/intern/gpu_buffers.c
branches/smoke2/source/blender/gpu/intern/gpu_draw.c
branches/smoke2/source/blender/gpu/intern/gpu_material.c
branches/smoke2/source/blender/ikplugin/intern/iksolver_plugin.c
branches/smoke2/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/smoke2/source/blender/imbuf/intern/anim_movie.c
branches/smoke2/source/blender/imbuf/intern/bmp.c
branches/smoke2/source/blender/imbuf/intern/filter.c
branches/smoke2/source/blender/imbuf/intern/imageprocess.c
branches/smoke2/source/blender/imbuf/intern/indexer.c
branches/smoke2/source/blender/imbuf/intern/indexer_dv.c
branches/smoke2/source/blender/imbuf/intern/iris.c
branches/smoke2/source/blender/imbuf/intern/jp2.c
branches/smoke2/source/blender/imbuf/intern/jpeg.c
branches/smoke2/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/smoke2/source/blender/imbuf/intern/png.c
branches/smoke2/source/blender/imbuf/intern/readimage.c
branches/smoke2/source/blender/imbuf/intern/rectop.c
branches/smoke2/source/blender/imbuf/intern/scaling.c
branches/smoke2/source/blender/imbuf/intern/targa.c
branches/smoke2/source/blender/imbuf/intern/thumbs.c
branches/smoke2/source/blender/imbuf/intern/util.c
branches/smoke2/source/blender/makesdna/DNA_brush_types.h
branches/smoke2/source/blender/makesdna/DNA_listBase.h
branches/smoke2/source/blender/makesdna/DNA_meshdata_types.h
branches/smoke2/source/blender/makesdna/DNA_node_types.h
branches/smoke2/source/blender/makesdna/DNA_object_fluidsim.h
branches/smoke2/source/blender/makesdna/DNA_object_force.h
branches/smoke2/source/blender/makesdna/DNA_scene_types.h
branches/smoke2/source/blender/makesdna/DNA_sequence_types.h
branches/smoke2/source/blender/makesdna/DNA_space_types.h
branches/smoke2/source/blender/makesdna/DNA_userdef_types.h
branches/smoke2/source/blender/makesdna/intern/dna_genfile.c
branches/smoke2/source/blender/makesdna/intern/makesdna.c
branches/smoke2/source/blender/makesrna/intern/makesrna.c
branches/smoke2/source/blender/makesrna/intern/rna_action.c
branches/smoke2/source/blender/makesrna/intern/rna_actuator.c
branches/smoke2/source/blender/makesrna/intern/rna_boid.c
branches/smoke2/source/blender/makesrna/intern/rna_brush.c
branches/smoke2/source/blender/makesrna/intern/rna_constraint.c
branches/smoke2/source/blender/makesrna/intern/rna_curve.c
branches/smoke2/source/blender/makesrna/intern/rna_fluidsim.c
branches/smoke2/source/blender/makesrna/intern/rna_image.c
branches/smoke2/source/blender/makesrna/intern/rna_lamp.c
branches/smoke2/source/blender/makesrna/intern/rna_main.c
branches/smoke2/source/blender/makesrna/intern/rna_material.c
branches/smoke2/source/blender/makesrna/intern/rna_modifier.c
branches/smoke2/source/blender/makesrna/intern/rna_movieclip.c
branches/smoke2/source/blender/makesrna/intern/rna_nodetree.c
branches/smoke2/source/blender/makesrna/intern/rna_object.c
branches/smoke2/source/blender/makesrna/intern/rna_object_api.c
branches/smoke2/source/blender/makesrna/intern/rna_object_force.c
branches/smoke2/source/blender/makesrna/intern/rna_particle.c
branches/smoke2/source/blender/makesrna/intern/rna_pose.c
branches/smoke2/source/blender/makesrna/intern/rna_property.c
branches/smoke2/source/blender/makesrna/intern/rna_scene.c
branches/smoke2/source/blender/makesrna/intern/rna_sensor.c
branches/smoke2/source/blender/makesrna/intern/rna_sequencer.c
branches/smoke2/source/blender/makesrna/intern/rna_space.c
branches/smoke2/source/blender/makesrna/intern/rna_texture.c
branches/smoke2/source/blender/makesrna/intern/rna_texture_api.c
branches/smoke2/source/blender/makesrna/intern/rna_userdef.c
branches/smoke2/source/blender/modifiers/intern/MOD_boolean_util.c
branches/smoke2/source/blender/modifiers/intern/MOD_collision.c
branches/smoke2/source/blender/modifiers/intern/MOD_explode.c
branches/smoke2/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/smoke2/source/blender/modifiers/intern/MOD_mask.c
branches/smoke2/source/blender/modifiers/intern/MOD_particleinstance.c
branches/smoke2/source/blender/modifiers/intern/MOD_util.c
branches/smoke2/source/blender/modifiers/intern/MOD_uvproject.c
branches/smoke2/source/blender/modifiers/intern/MOD_warp.c
branches/smoke2/source/blender/nodes/composite/node_composite_util.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_filter.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_gamma.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_levels.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_texture.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/smoke2/source/blender/nodes/intern/node_common.c
branches/smoke2/source/blender/nodes/intern/node_socket.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_vectMath.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_bricks.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_image.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/smoke2/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/smoke2/source/blender/quicktime/apple/quicktime_export.c
branches/smoke2/source/blender/quicktime/apple/quicktime_import.c
branches/smoke2/source/blender/render/intern/include/render_types.h
branches/smoke2/source/blender/render/intern/include/sunsky.h
branches/smoke2/source/blender/render/intern/raytrace/bvh.h
branches/smoke2/source/blender/render/intern/raytrace/rayobject_blibvh.cpp
branches/smoke2/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/smoke2/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
branches/smoke2/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
branches/smoke2/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
branches/smoke2/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
branches/smoke2/source/blender/render/intern/raytrace/reorganize.h
branches/smoke2/source/blender/render/intern/raytrace/vbvh.h
branches/smoke2/source/blender/render/intern/source/convertblender.c
branches/smoke2/source/blender/render/intern/source/envmap.c
branches/smoke2/source/blender/render/intern/source/imagetexture.c
branches/smoke2/source/blender/render/intern/source/occlusion.c
branches/smoke2/source/blender/render/intern/source/pipeline.c
branches/smoke2/source/blender/render/intern/source/pixelshading.c
branches/smoke2/source/blender/render/intern/source/pointdensity.c
branches/smoke2/source/blender/render/intern/source/rayshade.c
branches/smoke2/source/blender/render/intern/source/render_texture.c
branches/smoke2/source/blender/render/intern/source/rendercore.c
branches/smoke2/source/blender/render/intern/source/renderdatabase.c
branches/smoke2/source/blender/render/intern/source/shadbuf.c
branches/smoke2/source/blender/render/intern/source/shadeoutput.c
branches/smoke2/source/blender/render/intern/source/sss.c
branches/smoke2/source/blender/render/intern/source/strand.c
branches/smoke2/source/blender/render/intern/source/sunsky.c
branches/smoke2/source/blender/render/intern/source/volume_precache.c
branches/smoke2/source/blender/render/intern/source/volumetric.c
branches/smoke2/source/blender/render/intern/source/voxeldata.c
branches/smoke2/source/blender/render/intern/source/zbuf.c
branches/smoke2/source/blender/windowmanager/intern/wm_event_system.c
branches/smoke2/source/blender/windowmanager/intern/wm_operators.c
branches/smoke2/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/smoke2/source/creator/CMakeLists.txt
branches/smoke2/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/smoke2/source/gameengine/BlenderRoutines/SConscript
branches/smoke2/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/smoke2/source/gameengine/Converter/CMakeLists.txt
branches/smoke2/source/gameengine/Converter/SConscript
branches/smoke2/source/gameengine/GamePlayer/xembed/UnixShell.c
branches/smoke2/source/gameengine/Ketsji/BL_Shader.h
branches/smoke2/source/gameengine/Ketsji/CMakeLists.txt
branches/smoke2/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/smoke2/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/smoke2/source/gameengine/Ketsji/KX_FontObject.h
branches/smoke2/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/smoke2/source/gameengine/Ketsji/KX_PyMath.h
branches/smoke2/source/gameengine/Ketsji/SConscript
branches/smoke2/source/gameengine/Rasterizer/RAS_ICanvas.h
branches/smoke2/source/gameengine/VideoTexture/ImageRender.cpp
branches/smoke2/source/tools/uncrustify.cfg
Added Paths:
-----------
branches/smoke2/source/blender/bmesh/operators/bmo_hull.c
branches/smoke2/source/blender/bmesh/operators/bmo_wireframe.c
Property Changed:
----------------
branches/smoke2/extern/libmv/libmv/simple_pipeline/modal_solver.h
branches/smoke2/intern/cycles/bvh/bvh_binning.cpp
branches/smoke2/intern/cycles/bvh/bvh_binning.h
branches/smoke2/intern/cycles/bvh/bvh_split.cpp
branches/smoke2/intern/cycles/bvh/bvh_split.h
branches/smoke2/intern/cycles/util/util_task.cpp
branches/smoke2/intern/cycles/util/util_task.h
branches/smoke2/source/blender/editors/space_outliner/
Modified: branches/smoke2/CMakeLists.txt
===================================================================
--- branches/smoke2/CMakeLists.txt 2012-04-30 12:09:25 UTC (rev 46112)
+++ branches/smoke2/CMakeLists.txt 2012-04-30 12:44:43 UTC (rev 46113)
@@ -228,6 +228,7 @@
option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
endif()
option(WITH_PYTHON_INSTALL "Copy system python into the blender install folder" ON)
+option(WITH_PYTHON_INSTALL_NUMPY "Copy system numpy into the blender install folder" ON)
option(WITH_MINGW64 "Use the 64-bit version of MinGW" OFF)
mark_as_advanced(WITH_MINGW64)
@@ -827,7 +828,7 @@
set(CMAKE_C_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /MT /Zi" CACHE STRING "MSVC MT flags " FORCE)
# most msvc warnings are C & C++
- set(_WARNINGS "/W3 /wd4018 /wd4244 /wd4305 /wd4800 /wd4181 /wd4065 /wd4267 /we4013")
+ set(_WARNINGS "/W3 /wd4018 /wd4244 /wd4305 /wd4800 /wd4181 /wd4065 /wd4267 /we4013 /wd4200")
set(C_WARNINGS "${_WARNINGS}")
set(CXX_WARNINGS "${_WARNINGS}")
unset(_WARNINGS)
@@ -1612,6 +1613,13 @@
"to a valid python include path. Containing "
"Python.h for python version \"${PYTHON_VERSION}\"")
endif()
+
+ if(WITH_PYTHON_INSTALL_NUMPY)
+ if(NOT EXISTS "${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/numpy")
+ message(WARNING "Numpy path '${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/numpy' is missing, "
+ "WITH_PYTHON_INSTALL_NUMPY option will be ignored when installing python")
+ endif()
+ endif()
endif()
@@ -1668,7 +1676,7 @@
_setting)
set(_msg " * ${_setting}")
string(LENGTH "${_msg}" _len)
- while("28" GREATER "${_len}")
+ while("32" GREATER "${_len}")
set(_msg "${_msg} ")
math(EXPR _len "${_len} + 1")
endwhile()
@@ -1728,6 +1736,7 @@
info_cfg_text("Python:")
info_cfg_option(WITH_PYTHON_INSTALL)
+ info_cfg_option(WITH_PYTHON_INSTALL_NUMPY)
info_cfg_option(WITH_PYTHON_MODULE)
info_cfg_option(WITH_PYTHON_SAFETY)
Modified: branches/smoke2/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/smoke2/build_files/scons/config/win32-vc-config.py 2012-04-30 12:09:25 UTC (rev 46112)
+++ branches/smoke2/build_files/scons/config/win32-vc-config.py 2012-04-30 12:44:43 UTC (rev 46113)
@@ -163,7 +163,7 @@
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
#CUDA
-WITH_BF_CYCLES_CUDA_BINARIES = True
+WITH_BF_CYCLES_CUDA_BINARIES = False
#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
Modified: branches/smoke2/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/smoke2/build_files/scons/config/win64-vc-config.py 2012-04-30 12:09:25 UTC (rev 46112)
+++ branches/smoke2/build_files/scons/config/win64-vc-config.py 2012-04-30 12:44:43 UTC (rev 46113)
@@ -160,7 +160,7 @@
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
#CUDA
-WITH_BF_CYCLES_CUDA_BINARIES = True
+WITH_BF_CYCLES_CUDA_BINARIES = False
#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
Property changes on: branches/smoke2/extern/libmv/libmv/simple_pipeline/modal_solver.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/smoke2/intern/cycles/bvh/bvh_binning.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/smoke2/intern/cycles/bvh/bvh_binning.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/smoke2/intern/cycles/bvh/bvh_split.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/smoke2/intern/cycles/bvh/bvh_split.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: branches/smoke2/intern/cycles/kernel/kernel_camera.h
===================================================================
--- branches/smoke2/intern/cycles/kernel/kernel_camera.h 2012-04-30 12:09:25 UTC (rev 46112)
+++ branches/smoke2/intern/cycles/kernel/kernel_camera.h 2012-04-30 12:44:43 UTC (rev 46113)
@@ -130,7 +130,7 @@
float3 Pcamera = transform_perspective(&rastertocamera, make_float3(raster_x, raster_y, 0.0f));
/* create ray form raster position */
- ray->P = make_float3(0.0, 0.0f, 0.0f);
+ ray->P = make_float3(0.0f, 0.0f, 0.0f);
ray->D = equirectangular_to_direction(Pcamera.x, Pcamera.y);
/* transform ray from camera to world */
Modified: branches/smoke2/intern/cycles/kernel/kernel_compat_opencl.h
===================================================================
--- branches/smoke2/intern/cycles/kernel/kernel_compat_opencl.h 2012-04-30 12:09:25 UTC (rev 46112)
+++ branches/smoke2/intern/cycles/kernel/kernel_compat_opencl.h 2012-04-30 12:44:43 UTC (rev 46113)
@@ -78,7 +78,7 @@
#define make_float2(x, y) ((float2)(x, y))
#ifdef __CL_NO_FLOAT3__
-#define make_float3(x, y, z) ((float4)(x, y, z, 0.0))
+#define make_float3(x, y, z) ((float4)(x, y, z, 0.0f))
#else
#define make_float3(x, y, z) ((float3)(x, y, z))
#endif
Modified: branches/smoke2/intern/cycles/kernel/svm/svm_gamma.h
===================================================================
--- branches/smoke2/intern/cycles/kernel/svm/svm_gamma.h 2012-04-30 12:09:25 UTC (rev 46112)
+++ branches/smoke2/intern/cycles/kernel/svm/svm_gamma.h 2012-04-30 12:44:43 UTC (rev 46113)
@@ -23,11 +23,11 @@
float3 color = stack_load_float3(stack, in_color);
float gamma = stack_load_float(stack, in_gamma);
- if (color.x > 0.0)
+ if (color.x > 0.0f)
color.x = powf(color.x, gamma);
- if (color.y > 0.0)
+ if (color.y > 0.0f)
color.y = powf(color.y, gamma);
- if (color.z > 0.0)
+ if (color.z > 0.0f)
color.z = powf(color.z, gamma);
if (stack_valid(out_color))
Modified: branches/smoke2/intern/cycles/util/util_boundbox.h
===================================================================
--- branches/smoke2/intern/cycles/util/util_boundbox.h 2012-04-30 12:09:25 UTC (rev 46112)
+++ branches/smoke2/intern/cycles/util/util_boundbox.h 2012-04-30 12:44:43 UTC (rev 46113)
@@ -50,7 +50,7 @@
{
}
- static struct empty_t {} empty;
+ enum empty_t { empty = 0};
__forceinline BoundBox(empty_t)
: min(make_float3(FLT_MAX, FLT_MAX, FLT_MAX)), max(make_float3(-FLT_MAX, -FLT_MAX, -FLT_MAX))
Modified: branches/smoke2/intern/cycles/util/util_math.h
===================================================================
--- branches/smoke2/intern/cycles/util/util_math.h 2012-04-30 12:09:25 UTC (rev 46112)
+++ branches/smoke2/intern/cycles/util/util_math.h 2012-04-30 12:44:43 UTC (rev 46113)
@@ -541,7 +541,7 @@
#endif
}
-__device_inline float reduce_add(const float3& a)
+__device_inline float reduce_add(const float3 a)
{
#ifdef __KERNEL_SSE__
return (a.x + a.y + a.z);
Property changes on: branches/smoke2/intern/cycles/util/util_task.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/smoke2/intern/cycles/util/util_task.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: branches/smoke2/intern/cycles/util/util_types.h
===================================================================
--- branches/smoke2/intern/cycles/util/util_types.h 2012-04-30 12:09:25 UTC (rev 46112)
+++ branches/smoke2/intern/cycles/util/util_types.h 2012-04-30 12:44:43 UTC (rev 46113)
@@ -36,7 +36,7 @@
#define __shared
#define __constant
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(FREE_WINDOWS)
#define __device_inline static __forceinline
#define __align(...) __declspec(align(__VA_ARGS__))
#else
Modified: branches/smoke2/intern/ghost/intern/GHOST_NDOFManager.cpp
===================================================================
--- branches/smoke2/intern/ghost/intern/GHOST_NDOFManager.cpp 2012-04-30 12:09:25 UTC (rev 46112)
+++ branches/smoke2/intern/ghost/intern/GHOST_NDOFManager.cpp 2012-04-30 12:44:43 UTC (rev 46113)
@@ -286,7 +286,7 @@
}
if (m_buttonMask == 0)
- m_buttonMask = ~(-1 << m_buttonCount);
+ m_buttonMask = (int) ~(UINT_MAX << m_buttonCount);
#ifdef DEBUG_NDOF_BUTTONS
printf("ndof: %d buttons -> hex:%X\n", m_buttonCount, m_buttonMask);
Modified: branches/smoke2/intern/smoke/intern/smoke_API.cpp
===================================================================
--- branches/smoke2/intern/smoke/intern/smoke_API.cpp 2012-04-30 12:09:25 UTC (rev 46112)
+++ branches/smoke2/intern/smoke/intern/smoke_API.cpp 2012-04-30 12:44:43 UTC (rev 46113)
@@ -276,7 +276,7 @@
return fluid->_obstacles;
}
-extern "C" void smoke_get_ob_velocity(struct FLUID_3D *fluid, float **x, float **y, float **z)
+extern "C" void smoke_get_ob_velocity(FLUID_3D *fluid, float **x, float **y, float **z)
{
*x = fluid->_xVelocityOb;
*y = fluid->_yVelocityOb;
Modified: branches/smoke2/release/scripts/startup/bl_operators/uvcalc_lightmap.py
===================================================================
--- branches/smoke2/release/scripts/startup/bl_operators/uvcalc_lightmap.py 2012-04-30 12:09:25 UTC (rev 46112)
+++ branches/smoke2/release/scripts/startup/bl_operators/uvcalc_lightmap.py 2012-04-30 12:44:43 UTC (rev 46113)
@@ -157,18 +157,17 @@
angles_co.sort()
I = [i for a, i in angles_co]
- #~ fuv = f.uv
uv_layer = f.id_data.uv_layers.active.data
- fuv = [uv_layer[i].uv for i in f.loops] # XXX25
+ fuv = [uv_layer[i].uv for i in f.loop_indices]
if self.rot:
- fuv[I[2]] = p1
- fuv[I[1]] = p2
- fuv[I[0]] = p3
+ fuv[I[2]][:] = p1
+ fuv[I[1]][:] = p2
+ fuv[I[0]][:] = p3
else:
- fuv[I[2]] = p1
- fuv[I[0]] = p2
- fuv[I[1]] = p3
+ fuv[I[2]][:] = p1
+ fuv[I[0]][:] = p2
+ fuv[I[1]][:] = p3
f, lens, lensord = uv[0]
@@ -179,10 +178,10 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list