diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-03-18 00:44:58 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-03-18 00:44:58 +0300 |
| commit | d52400bfbd2a7e4d09b5a71bc461a554d232af15 (patch) | |
| tree | 08815f065fc90aac0ae62ae5f3a89d20e19399e6 /source/creator | |
| parent | 1ac0d54fea831c485e8e27e8bfa887e15beb58de (diff) | |
| parent | 28f6d223d079b1e5cb67e3fc22fb7f818deb8dcb (diff) | |
2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r18677:19317
Notes:
* Sequence transform strip uses G.scene global, this is commented
out now, should be fixed.
* Etch-a-ton code was most difficult to merge. The files already in
2.5 got merged, but no new files were added. Calls to these files
are commented out with "XXX etch-a-ton". editarmature.c and
transform_snap.c were complex to merge. Martin, please check?
* Game engine compiles and links again here for scons/make/cmake
(player still fails to link).
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | source/creator/Makefile | 3 | ||||
| -rw-r--r-- | source/creator/creator.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 55e04783ab7..170d49fc1d8 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -210,7 +210,6 @@ IF(UNIX) bf_editors bf_decimation blender_BSP - bf_soundsystem bf_ghost bf_string blender_render @@ -271,10 +270,12 @@ IF(UNIX) bf_quicktime extern_binreloc extern_glew + extern_libopenjpeg bf_videotex bf_rna bf_dna bf_blenfont + bf_soundsystem ) FOREACH(SORTLIB ${BLENDER_SORTED_LIBS}) diff --git a/source/creator/Makefile b/source/creator/Makefile index ea301ad80a9..fe281ad8d0e 100644 --- a/source/creator/Makefile +++ b/source/creator/Makefile @@ -59,6 +59,9 @@ CPPFLAGS += -I$(NAN_GLEW)/include ifeq ($(WITH_QUICKTIME), true) CPPFLAGS += -I$(NAN_QUICKTIME)/include -DWITH_QUICKTIME endif +ifeq ($(WITH_OPENJPEG), true) + CPPFLAGS += -DWITH_OPENJPEG +endif ifeq ($(WITH_BINRELOC), true) CPPFLAGS += -I$(NANBLENDERHOME)/extern/binreloc/include -DWITH_BINRELOC diff --git a/source/creator/creator.c b/source/creator/creator.c index ad50e425415..69f80570334 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -751,7 +751,7 @@ int main(int argc, char **argv) else if (!strcmp(argv[a],"CINEON")) scene->r.imtype = R_CINEON; else if (!strcmp(argv[a],"DPX")) scene->r.imtype = R_DPX; #if WITH_OPENJPEG - else if (!strcmp(argv[a],"JP2")) G.scene->r.imtype = R_JP2; + else if (!strcmp(argv[a],"JP2")) scene->r.imtype = R_JP2; #endif else printf("\nError: Format from '-F' not known or not compiled in this release.\n"); } |