Blender Git Loki

fix conflict in merged file. weird, it compiled ok wednesday.

More cosmetic changes to the bullet buttons: move most common soft body buttons to main panel, only leave advanced settings in advanced panel. Reduce size of advance panel.

bugfix: add Ghost support for soft bodies, so that they don't collide with ghosts, and can be ghost themselves.

Move the Solaris workaround in btScalar behind the sun define, to only make sun and apple ppc slower:
#if defined (__sun) || defined (__sun__) || defined (__sparc) || (defined (__APPLE__) && ! defined (__i386__))
Also includes a fix to uninitialized variable (can cause failing collisions).

If possible, report all changes to extern/bullet2 to http://code.google.com/p/bullet/issues/list

BGE patch: some cosmetic change in the bullet buttons:

- Bring Actor button back in main panel: makes the users
life easier to identify which object is visible to
near and radar sensors.
- Give more space to the Advanced Settings panel.
- Display radius control button even for static objects
if sphere bound shape is selected. Same for displaying
the radius in the 3D view.

Fix for part of bug #17464, though not the original issue yet. A GLSL
shadow drawing fix also affected 3d view opengl render, hiding armatures,
now there's separate flags for it.

Small fix for (harmless) use of uninitialized memory.

2.5 Branch: added WM_report and WM_reportf functions for reporting
information, warnings and errors.

Solaris was having problems with sqrtf and friends again.
I changed sqrtf to sqrt in elbeem
in bullet2 I added defines found in floatpatch.h eventually
we should make a "floatpatch.h" that all of blender can use.

Kent

Bugfix for fluidsim UI inconsistencies, please check your settings in old files

More Grease Pencil touchups:

* Eraser size is now UserPref. This way it is more easily tweaked than using layer stroke-thickness squared, but it is less accessible.

* Restored stroke 'smoothing' (post-conversion) option as UserPref option. Off by default.

* Fixed bug with convert tools. Was adding an extra datablock everytime, that wasn't being used (and was subsequently dicarded).

* Moved pressure vars from paint-loop to temp-struct (during painting). Also, moved the macro which tests for converting straight lines.

interpreted request from Carsten - make message sensor work.
object message actuators needed the prefix OB when sending a message to a specific object.--This line, and those below, will be ignored--

M source/gameengine/Converter/KX_ConvertActuators.cpp
M source/blender/blenkernel/BKE_blender.h
M source/blender/src/buttons_logic.c
M source/blender/blenloader/intern/readfile.c

Grease Pencil bugfix:

Disabled fancy 'dot' drawing for Image Editor. This is still just a quick-fix (like for fancy strokes), and it would be nice to get the scaling right someday.

Blender works with python 2.6, our own import functions that replace pythons internal function needed updating for an extra in argument in 2.6.

if importing is not working blender should not crash (was crashing on exit)

error with GameLogic.globalDict loading. It would replace the dictionary rather then updating it.
This meant the BGE would load in an old dictonary replacing the loaded dict, loosing settings.

was also missing a decref for marshal data

Added back a few lines that were accidentally chopped out when fixing pad0 view feature. This means that the grid is drawn correctly (i.e. not shown) when the view is rotated using the numpad up/down/left/right keys.

Fix for bug #17722: sun light in the texture viewmode was broken.

Fix for bug #17735: vertex color render layer got invalid value
when switching to weight paint mode.

merge trunk 16118 -> 116886

transform snap bugfix: correctly ignore hidden elements when snapping to edit mode mesh