Blender Git Commits

Bringing the patch back into the branch.
The changelog:
* properties_scene.py now uses COMPAT_ENGINES properly
* fixed an error in space_logic.py
* changed cmake flag WITH_DDS to WITH_IMAGE_DDS
* fixed a crash with reading mipmap data in DDS files
* fixed an inconsistency in GPG_Application.cpp
* added a comment explaining why USER_DISABLE_VBO is set in GPG_ghost.cpp
* removed some code that was accidentally committed to refix a crash from libloaded lights
* fixed a memory leak with dynamic lights
* reapplied a fix for raycasting (seems to always disappear)

Thanks to Mitchell Stokes for the DDS fixes

Merge from trunk r40540

replacing cast from pointer from long to intptr_t (thanks Campbell)

pointers should be cast to long, not int (build fix for OSX+CMake+Make)

Merge from trunk r39703

Merge from trunk r39684

Merge from trunk r39354

Revision: 31092
Author: nicholasbishop
Date: 11:16:13 PM, Thursday, August 05, 2010
Message:
== Ptex ==

Fixes for triangles

* the quad-mesh-with-triangles example file from ptex contains subfaces with
non-matching resolutions; changed the internal MPtex format to store
separate resolutions for each subface

* changed ptex drawing to give each subface its own texture

* various fixes to the loading and painting code to support triangles

* small change to the ptex build files, hopefully fixes and MSVC issue
----
Modified : /branches/soc-2010-nicolasbishop/extern/ptex/CMakeLists.txt
Modified : /branches/soc-2010-nicolasbishop/extern/ptex/SConscript
Modified : /branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/writefile.c
Modified : /branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_vertex.c
Modified : /branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/ptex.c
Modified : /branches/soc-2010-nicolasbishop/source/blender/gpu/intern/gpu_buffers.c
Modified : /branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_meshdata_types.h

Revision: 31097
Author: nicholasbishop
Date: 12:57:23 AM, Friday, August 06, 2010
Message:
== Ptex ==

* Small bugfix for my previous commit, broke ptex generation

----
Modified : /branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/ptex.c

jwilkins:
Added a temporary pre-processor definition ENABLE_PTEX so I can separate out changes to vertex paint involving ptex from the old vertex paint system. Although Ptex could be seen as obsoleting vertex paint, I'd like to preserve the old functionality for now. Later I can refactor so that both systems exist side by side.

VBOs now update when necessary.
VBOs are now interleaved to avoid iterating over the vertex list more than is necessary.
Removed some allocation/deallocation in the update code that was causing some slow downs.

Added color to the VBOs, this also happens to fix TexFace mode.

Recently VBOs started acting up when using display lists. Since the two really shouldn't be used together, and since using the two together cause no performance gain, display lists are disabled when VBO is chosen as the storage type. This is also reflected in the UI.

Sorted out some problems with scrambled UVs caused by the changes made for multiple UV support.

RayCasting makes use of collision masks. This needed to be updated to accommodate user settable collision groups and collision masks.

Fixed a crash caused by libload when no dynamic lights were allocated. Thanks to jplur for pointing it out to me on the IRC.

Looks like a merge from Trunk had messed up the change to have the bake menu in the game render panel. This brings it back.

Libloaded lights now work with the dynamic light settings.

The Desktop option is now greyed out when fullscreen is not checked rather than disappearing from the UI completely.

Now dynamic lights from the light pool don't get converted to game objects.

Now the Desktop option is only available when fullscreen is checked.

Fixed up RAS_StorageVA so TexFace works again.