Andre Susano Pinto 149f7f07d2 Merge trunk with branch ...

svn merge -r 14521:head https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-04-23 13:06:53 +00:00

..

blender

Merge trunk with branch

2008-04-23 13:06:53 +00:00

creator

Used GET_INT_FROM_POINTER to get rid of many warnings that only occurred with 64bit os's

2008-04-17 21:14:55 +00:00

darwin

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

gameengine

second attempt to fix compilation problem with 2D shaders on systems without GLExt or without shader support: use GL_ARB_shader_objects to conditionally compile the 2D shader code

2008-04-20 21:01:13 +00:00

icons

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

kernel

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

CMakeLists.txt

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

Makefile

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

nan_compile.mk

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

nan_definitions.mk

Small fix from GSR for using pkg-config to find OpenEXR libraries

2008-04-21 03:55:39 +00:00

nan_link.mk

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

nan_subdirs.mk

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

nan_warn.mk

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

SConscript

Filling in branch from trunk

2007-11-06 22:29:20 +00:00