February 4, 2015, 13:19 (GMT) |
Merge remote-tracking branch 'origin/master' into multiview The conflict solving included a change in openexr_api.cpp (to have COMBINED always on head) that I'm not sure I should go ahead with. So this little bit may be reverted later. Conflicts: intern/cycles/blender/blender_camera.cpp source/blender/blenkernel/BKE_sequencer.h source/blender/blenkernel/intern/image.c source/blender/blenkernel/intern/sequencer.c source/blender/blenkernel/intern/writeframeserver.c source/blender/editors/include/ED_view3d.h source/blender/editors/sculpt_paint/paint_image_proj.c source/blender/editors/space_sequencer/sequencer_edit.c source/blender/imbuf/IMB_imbuf_types.h source/blender/imbuf/intern/openexr/openexr_api.cpp source/blender/makesdna/DNA_image_types.h source/blender/makesrna/intern/rna_image.c source/blender/render/intern/source/render_result.c source/blender/windowmanager/intern/wm_files.c |
February 4, 2015, 13:16 (GMT) |
BGE physics: allow higher values for maxlogicstep and maxphystep Increasing those values beyond 5 is important for exact physics simulation. Soft limit is increased to 50, hard limit to 10000. To be able to set different values for hardlimit and softlimit, RNA_def_property_range needs to precede RNA_def_property_range, hence the swapped order. |
Revision f27389c by Antonis Ryakiotakis (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) February 4, 2015, 12:56 (GMT) |
Better implementation for cache disable - do not store or retrieve cache ever if debug value is 314 |
Revision 1ec9604 by Antonis Ryakiotakis (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) February 4, 2015, 12:40 (GMT) |
Merge branch 'master' into gooseberry |
Revision 4895459 by Antonis Ryakiotakis (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) February 4, 2015, 12:35 (GMT) |
Disable sequencer preprocess cache if 314 debug value is set |
February 4, 2015, 11:50 (GMT) |
Compiler warnings tweak for scons + mingw64 The warning flags in C_WARN were not actually getting included (most notably, the one disabling the pointless + braindead one about using chars to index into arrays - given that we only use unsigned chars everywhere). Maybe this should get done for the other scons platforms too? |
February 4, 2015, 11:46 (GMT) |
Fix missing panels (likely removed in a oerge conflict "fix") |
February 4, 2015, 11:18 (GMT) |
Merge branch 'master' into depsgraph_refactor Conflicts: source/blender/blenkernel/intern/armature.c source/blender/modifiers/intern/MOD_hook.c |
February 4, 2015, 11:04 (GMT) |
Fix T43552: Cannot jump between GP keyframes in dopesheet |
February 4, 2015, 11:02 (GMT) |
Fix for recent LANG locale workaround Need to get a copy of the string since stored pointer is affected by subsequent calls of setlocale(). |
February 4, 2015, 10:54 (GMT) |
GLSL: On some cards '>' can't operate on 'float' and 'int' So make it so comparison doesn't imply type-cast. |
February 4, 2015, 10:44 (GMT) |
Merge branch 'master' into temp_custom_loop_normals |
February 4, 2015, 10:43 (GMT) |
tmp |
February 4, 2015, 09:49 (GMT) |
Cycles: Use pre-aligned triangle vertex coordinates for subsurface intersection This gives small speedup (around 2% in quick tests) for ray scattering. |
February 4, 2015, 08:04 (GMT) |
Compositor: Code cleanup, trailing whitespace and wrapping |
February 3, 2015, 20:47 (GMT) |
Make 'recursion' work as expected. Now, recursion 0 = previous behavior, recursion 1 = only show content of immediate .blend files, do not recurse in actual dir hierarchy, recursion >1 = complete recursion! |
Revision becce54 by Campbell Barton (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) February 3, 2015, 20:19 (GMT) |
Merge branch 'master' into gooseberry Conflicts: source/blender/blenkernel/intern/image.c |
February 3, 2015, 20:18 (GMT) |
Flat listing of libs: do not show the 'categories' directories unless we are inside a single .blend lib in this case, useless and heavily clutters space. |
February 3, 2015, 20:17 (GMT) |
Compositor: Implement sampled motion blur for plane track deform node Quite striaghtforward change, and in theory we can even try supporting motion blur for the corner pin node (which is tricky because coordinates actually coming from sockets, but with some black magic should be doable). |
February 3, 2015, 20:16 (GMT) |
Hook Modifier: add falloff & radius options - Add falloff types & curves (matching warp-modifier) - Add uniform scale option, important when adding hooks to non-uniform scaled objects, especially for use with lattice objects which can't avoid uneven scaling. This uses relative transformation set when the hook is assigned, when measuring the distances. |
|
|
|


Master Commits
MiikaHweb | 2003-2021