Revision 3db5b76 by Martin Felke (fracture_modifier, fracture_modifier-master, temp-fracture-modifier-2.8) February 21, 2016, 12:27 (GMT) |
compile fix after merge |
Revision 1c09344 by Martin Felke (fracture_modifier, fracture_modifier-master, temp-fracture-modifier-2.8) February 21, 2016, 12:27 (GMT) |
Merge remote-tracking branch 'refs/remotes/origin/master' into fracture_modifier Conflicts: CMakeLists.txt SConstruct build_files/build_environment/install_deps.sh build_files/scons/tools/Blender.py build_files/scons/tools/btools.py extern/CMakeLists.txt extern/SConscript extern/bullet2/CMakeLists.txt intern/cycles/blender/blender_camera.cpp intern/cycles/blender/blender_texture.cpp intern/cycles/kernel/geom/geom_triangle_intersect.h intern/cycles/kernel/kernel_compat_cpu.h intern/cycles/kernel/svm/svm_voxel.h intern/cycles/util/util_path.cpp intern/ghost/intern/GHOST_ContextGLX.cpp intern/iksolver/intern/IK_Solver.cpp release/datafiles/locale release/scripts/addons release/scripts/startup/bl_ui/space_userpref.py source/blender/blenkernel/BKE_blender.h source/blender/blenkernel/BKE_bvhutils.h source/blender/blenkernel/SConscript source/blender/blenkernel/intern/DerivedMesh.c source/blender/blenkernel/intern/armature.c source/blender/blenkernel/intern/cdderivedmesh.c source/blender/blenkernel/intern/editderivedmesh.c source/blender/blenkernel/intern/image.c source/blender/blenkernel/intern/mesh_remap.c source/blender/blenkernel/intern/particle.c source/blender/blenkernel/intern/rigidbody.c source/blender/blenlib/intern/string.c source/blender/blenloader/intern/readfile.c source/blender/editors/interface/interface.c source/blender/editors/interface/interface_handlers.c source/blender/editors/mesh/editmesh_knife.c source/blender/editors/mesh/editmesh_select.c source/blender/editors/object/object_bake_api.c source/blender/editors/space_graph/graph_ops.c source/blender/editors/space_outliner/outliner_intern.h source/blender/editors/space_outliner/outliner_tools.c source/blender/editors/space_sequencer/sequencer_edit.c source/blender/editors/space_view3d/drawmesh.c source/blender/editors/space_view3d/drawobject.c source/blender/editors/transform/transform_conversions.c source/blender/editors/transform/transform_input.c source/blender/editors/transform/transform_snap.c source/blender/makesdna/intern/makesdna.c source/blender/makesrna/SConscript source/blender/makesrna/intern/SConscript source/blender/makesrna/intern/rna_modifier.c source/blender/makesrna/intern/rna_nodetree.c source/blender/makesrna/intern/rna_rigidbody.c source/blender/modifiers/SConscript source/blender/python/mathutils/mathutils_geometry.c source/blender/render/extern/include/RE_render_ext.h source/blender/render/intern/source/bake_api.c source/blender/render/intern/source/pipeline.c source/blender/render/intern/source/pointdensity.c source/blender/render/intern/source/renderdatabase.c source/blender/windowmanager/WM_api.h source/blender/windowmanager/intern/wm_files.c source/blenderplayer/bad_level_call_stubs/stubs.c source/gameengine/Ketsji/BL_Action.cpp |
February 21, 2016, 12:16 (GMT) |
Fix compositor using edge repeat policy when it shouldn't Was easy to notice when alpha-overing smaller image with blur on the bigger frame. |
February 21, 2016, 07:35 (GMT) |
Fix/workarounds for a couple of crashes. |
February 21, 2016, 06:39 (GMT) |
Move Volume class definition to volume.h, also move some properties from the VolumeManager there, added some more code to handle attributes. |
February 21, 2016, 05:20 (GMT) |
Fix uninitialized var use initializing bake data |
February 21, 2016, 01:10 (GMT) |
Correct incomplete doxgen file paths in WM |
February 20, 2016, 22:26 (GMT) |
fix T47484: Added fallback solution (copy exported file when rename is not supported) |
February 20, 2016, 22:22 (GMT) |
Merge remote-tracking branch 'origin/master' into decklink Conflicts: source/gameengine/Ketsji/KX_KetsjiEngine.cpp |
February 20, 2016, 22:20 (GMT) |
Correct comment (and add another one) |
February 20, 2016, 20:42 (GMT) |
fix T47484: Added proper error reporting for Collada Exporter |
February 20, 2016, 20:17 (GMT) |
BGE: undo view matrix scaling but keep axis inverting. Previous commit 9d18fd11 introduced the possibility to scale the modelview matrix by setting a scale on the camera but this caused undesirable lighting and dynamic side effects. This commit reverts the scaling effect but keeps the axis inversion effect, which was the purpose of the first commit anyway. A negative/positive scale on the camera is applied respectively as -1/+1 scale on the modelview matrix. |
February 20, 2016, 20:15 (GMT) |
Decklink: patch cleanup before merge. |
February 20, 2016, 19:33 (GMT) |
fix T47484: Added final status of exported file to Blender console |
February 20, 2016, 19:22 (GMT) |
Fix unnecessary separators in image editor Image menu. |
February 20, 2016, 18:56 (GMT) |
Only show widget select keymap items for widget groups with selectable widgets |
February 20, 2016, 18:34 (GMT) |
Correct comment from previous commit |
February 20, 2016, 18:31 (GMT) |
Make key maps for widgets visible in key map editor For each editor that has widgets, we draw a "Widgets" category into it's key map list. Under this we have the key maps for the individual widget group types. Having to hardcode the entries in keyconfig_utils.py is not so nice, but don't know of a better way to do this. |
Revision 3054a8a by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap, libquery-recursive) February 20, 2016, 17:06 (GMT) |
Merge branch 'master' into libquery-recursive |
February 20, 2016, 16:56 (GMT) |
Fix crash enabling Use Multiview on images with an empty filepath. |
|
|
|


Master Commits
MiikaHweb | 2003-2021