diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-13 00:16:53 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-13 00:16:53 +0300 |
commit | bdfe7d89e2f1292644577972c716931b4ce3c6c3 (patch) | |
tree | d00eb50b749cb001e2b08272c91791e66740b05d /source/blender/editors | |
parent | 78a1c27c4a6abe0ed31ca93ad21910f3df04da56 (diff) | |
parent | 7e4db234cee71ead34ee81a12e27da4bd548eb4b (diff) |
Merge of trunk into blender 2.5:
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416
Issues:
* GHOST/X11 had conflicting changes. Some code was added in 2.5, which was
later added in trunk also, but reverted partially, specifically revision
16683. I have left out this reversion in the 2.5 branch since I think it is
needed there.
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683
* Scons had various conflicting changes, I decided to go with trunk version
for everything except priorities and some library renaming.
* In creator.c, there were various fixes and fixes for fixes related to the -w
-W and -p options. In 2.5 -w and -W is not coded yet, and -p is done
differently. Since this is changed so much, and I don't think those fixes
would be needed in 2.5, I've left them out.
* Also in creator.c: there was code for a python bugfix where the screen was not
initialized when running with -P. The code that initializes the screen there
I had to disable, that can't work in 2.5 anymore but left it commented as a
reminder.
Further I had to disable some new function calls. using src/ and python/, as
was done already in this branch, disabled function calls:
* bpath.c: error reporting
* BME_conversions.c: editmesh conversion functions.
* SHD_dynamic: disabled almost completely, there is no python/.
* KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled.
* text.c: clipboard copy call.
* object.c: OB_SUPPORT_MATERIAL.
* DerivedMesh.c and subsurf_ccg, stipple_quarttone.
Still to be done:
* Go over files and functions that were moved to a different location but could
still use changes that were done in trunk.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/datafiles/SConscript | 2 | ||||
-rw-r--r-- | source/blender/editors/include/BIF_gl.h | 14 | ||||
-rw-r--r-- | source/blender/editors/include/BIF_interface_icons.h | 0 | ||||
-rw-r--r-- | source/blender/editors/include/BIF_resources.h | 0 | ||||
-rw-r--r-- | source/blender/editors/include/BIF_view2d.h | 0 | ||||
-rw-r--r-- | source/blender/editors/interface/Makefile | 6 | ||||
-rw-r--r-- | source/blender/editors/interface/SConscript | 10 | ||||
-rw-r--r-- | source/blender/editors/screen/Makefile | 1 | ||||
-rw-r--r-- | source/blender/editors/screen/SConscript | 2 | ||||
-rw-r--r-- | source/blender/editors/screen/glutil.c | 1 | ||||
-rw-r--r-- | source/blender/editors/space_time/Makefile | 1 | ||||
-rw-r--r-- | source/blender/editors/space_time/SConscript | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/Makefile | 1 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/SConscript | 2 |
14 files changed, 28 insertions, 14 deletions
diff --git a/source/blender/editors/datafiles/SConscript b/source/blender/editors/datafiles/SConscript index 88ac37b84c9..e69c8567ca0 100644 --- a/source/blender/editors/datafiles/SConscript +++ b/source/blender/editors/datafiles/SConscript @@ -6,4 +6,4 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' #/intern/guardedalloc' -env.BlenderLib ( 'bf_editor_datafiles', sources, Split(incs), [], libtype=['core','intern'], priority=[5, 25] ) +env.BlenderLib ( 'bf_editor_datafiles', sources, Split(incs), [], libtype=['core','intern'], priority=[50, 55] ) diff --git a/source/blender/editors/include/BIF_gl.h b/source/blender/editors/include/BIF_gl.h index 244fd3bb78b..014201648c9 100644 --- a/source/blender/editors/include/BIF_gl.h +++ b/source/blender/editors/include/BIF_gl.h @@ -49,19 +49,13 @@ #endif #endif -#ifdef __APPLE__ -#include <OpenGL/gl.h> -#include <OpenGL/glu.h> -#else -#include <GL/gl.h> -#include <GL/glu.h> -#endif +#include "GL/glew.h" + /* * these should be phased out. cpack should be replaced in * code with calls to glColor3ub, lrectwrite probably should * change to a function. - zr */ - /* * * This define converts a numerical value to the equivalent 24-bit @@ -75,5 +69,9 @@ #define lrectwrite(a, b, c, d, rect) {glRasterPos2i(a, b);glDrawPixels((c)-(a)+1, (d)-(b)+1, GL_RGBA, GL_UNSIGNED_BYTE, rect);} +/* glStippleDefines, defined in glutil.c */ +extern GLubyte stipple_halftone[128]; +extern GLubyte stipple_quarttone[128]; + #endif /* #ifdef BIF_GL_H */ diff --git a/source/blender/editors/include/BIF_interface_icons.h b/source/blender/editors/include/BIF_interface_icons.h deleted file mode 100644 index e69de29bb2d..00000000000 --- a/source/blender/editors/include/BIF_interface_icons.h +++ /dev/null diff --git a/source/blender/editors/include/BIF_resources.h b/source/blender/editors/include/BIF_resources.h deleted file mode 100644 index e69de29bb2d..00000000000 --- a/source/blender/editors/include/BIF_resources.h +++ /dev/null diff --git a/source/blender/editors/include/BIF_view2d.h b/source/blender/editors/include/BIF_view2d.h deleted file mode 100644 index e69de29bb2d..00000000000 --- a/source/blender/editors/include/BIF_view2d.h +++ /dev/null diff --git a/source/blender/editors/interface/Makefile b/source/blender/editors/interface/Makefile index 39bb651a616..fe223fabf2a 100644 --- a/source/blender/editors/interface/Makefile +++ b/source/blender/editors/interface/Makefile @@ -35,6 +35,7 @@ include nan_compile.mk CFLAGS += $(LEVEL_1_C_WARNINGS) +CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(NAN_BMFONT)/include @@ -52,3 +53,8 @@ CPPFLAGS += -I../../ftfont # own include CPPFLAGS += -I../include + +ifeq ($(INTERNATIONAL), true) + CPPFLAGS += -DINTERNATIONAL +endif + diff --git a/source/blender/editors/interface/SConscript b/source/blender/editors/interface/SConscript index 0586d07d945..42e4db60edb 100644 --- a/source/blender/editors/interface/SConscript +++ b/source/blender/editors/interface/SConscript @@ -5,5 +5,13 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../makesrna ../../windowmanager #/intern/guardedalloc #intern/bmfont' +incs += ' #/extern/glew/include' -env.BlenderLib ( 'bf_editors_interface', sources, Split(incs), [], libtype=['core','intern'], priority=[40, 45] ) +defs = [] + +if env['WITH_BF_INTERNATIONAL']: + incs += ' ../../ftfont' + defs.append('INTERNATIONAL') + defs.append('FTGL_STATIC_LIBRARY') + +env.BlenderLib ( 'bf_editors_interface', sources, Split(incs), Split(defs), libtype=['core','intern'], priority=[40, 45] ) diff --git a/source/blender/editors/screen/Makefile b/source/blender/editors/screen/Makefile index 11cd8f264ad..b905d7c197b 100644 --- a/source/blender/editors/screen/Makefile +++ b/source/blender/editors/screen/Makefile @@ -35,6 +35,7 @@ include nan_compile.mk CFLAGS += $(LEVEL_1_C_WARNINGS) +CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) # not very neat.... diff --git a/source/blender/editors/screen/SConscript b/source/blender/editors/screen/SConscript index 8ca512fedc1..04a1d7f4388 100644 --- a/source/blender/editors/screen/SConscript +++ b/source/blender/editors/screen/SConscript @@ -5,6 +5,6 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../blenloader ../../windowmanager ../../python' -incs += ' #/intern/guardedalloc' +incs += ' #/intern/guardedalloc #/extern/glew/include' env.BlenderLib ( 'bf_editors_screen', sources, Split(incs), [], libtype=['core','intern'], priority=[30, 35] ) diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c index 5b776fd7f49..08587ddb9a5 100644 --- a/source/blender/editors/screen/glutil.c +++ b/source/blender/editors/screen/glutil.c @@ -422,7 +422,6 @@ void glaDrawPixelsTex(float x, float y, int img_w, int img_h, int format, void * glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); } -#define FTOCHAR(val) val<=0.0f?0: (val>=1.0f?255: (char)(255.0f*val)) void glaDrawPixelsSafe_to32(float fx, float fy, int img_w, int img_h, int row_w, float *rectf) { float *rf; diff --git a/source/blender/editors/space_time/Makefile b/source/blender/editors/space_time/Makefile index 72dca174dba..c64a81695bf 100644 --- a/source/blender/editors/space_time/Makefile +++ b/source/blender/editors/space_time/Makefile @@ -35,6 +35,7 @@ include nan_compile.mk CFLAGS += $(LEVEL_1_C_WARNINGS) +CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) # not very neat.... diff --git a/source/blender/editors/space_time/SConscript b/source/blender/editors/space_time/SConscript index 091218e0794..b83e79ff3e6 100644 --- a/source/blender/editors/space_time/SConscript +++ b/source/blender/editors/space_time/SConscript @@ -4,6 +4,6 @@ Import ('env') sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' -incs += '../../windowmanager #/intern/guardedalloc' +incs += '../../windowmanager #/intern/guardedalloc #/extern/glew/include' env.BlenderLib ( 'bf_editors_space_time', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] ) diff --git a/source/blender/editors/space_view3d/Makefile b/source/blender/editors/space_view3d/Makefile index 0631cf010b8..45b6ca648d2 100644 --- a/source/blender/editors/space_view3d/Makefile +++ b/source/blender/editors/space_view3d/Makefile @@ -35,6 +35,7 @@ include nan_compile.mk CFLAGS += $(LEVEL_1_C_WARNINGS) +CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) # not very neat.... diff --git a/source/blender/editors/space_view3d/SConscript b/source/blender/editors/space_view3d/SConscript index 6e6c9fdc29d..99b620544cd 100644 --- a/source/blender/editors/space_view3d/SConscript +++ b/source/blender/editors/space_view3d/SConscript @@ -4,6 +4,6 @@ Import ('env') sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' -incs += ' #/intern/guardedalloc' +incs += ' #/intern/guardedalloc #/extern/glew/include' env.BlenderLib ( 'bf_editors_space_view3d', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] ) |