Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
28,461 Commits 2 Branches 0 Tags
4e9a519e223a467a069d37eedef6f44081ba525a
Commit Graph

187 Commits

Author SHA1 Message Date
Tamito Kajiyama
4e9a519e22 Merged changes in the trunk up to revision 34574. 2011-01-30 23:41:58 +00:00
Campbell Barton
d75216ba1c - fix problem with cmake, windows 'RelWithDebInfo' target, was giving error: "ImportError: No module named _socket" because of copying wrong files over. 
- move test -> tests, this name is used elsewhere in lib/tests.
- change interface code not to loop on a float value (clang warning), harmless, but with extreme cases an eternal loop would still be possible though unlikely.
 2011-01-23 11:42:29 +00:00
Tamito Kajiyama
0ec378f3fe Merged changes in the trunk up to revision 34193. 
Conflicts resolved:
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/space_nla/nla_channels.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c

API changes resolved:
source/blender/freestyle/intern/system/PythonInterpreter.h
 2011-01-09 15:07:14 +00:00
Campbell Barton
96b646c68d edits for BPY_extern.h functions, no functional changes 
- remove unused code.
- BPY_run_python_script() split in 2, BPY_filepath_exec, BPY_text_exec
- renamed funcs.
 2011-01-05 02:08:54 +00:00
Tamito Kajiyama
3ead3c4ff3 Merged changes in the trunk up to revision 33894. 
A note for branch users: CMake 2.8 on 64-bit Windows Vista raised
an error in line 948 of soc-2008-mxcurioni/CMakeLists.txt due to
an invalid argument for the blender_include_dirs macro:

  blender_include_dirs(${OPENGL_INCLUDE_DIR})

The command above should be:

  blender_include_dirs("${OPENGL_INCLUDE_DIR}")
 2010-12-27 01:38:23 +00:00
Guillermo S. Romero
29799bf09c Compact -I paths in makefiles for more readble files/output. 
Also some white space cleaning and removal of redundant parameter.
 2010-12-22 22:15:20 +00:00
Campbell Barton
da153a509b CMake RelWithDebInfo uses python31.dll, not python31_d.dll 2010-12-19 16:09:24 +00:00
Tamito Kajiyama
3368a595da Merged changes in the trunk up to revision 33765. 2010-12-18 11:49:12 +00:00
Campbell Barton
5c621bd7f5 cmake was complaining when there was no libs skipped. 2010-12-17 04:41:48 +00:00
Campbell Barton
566bda734a last commit to fix warnings didnt set them at all, not it works as it should. 
also made cmakes output a lot quieter, messages can be uncommented for debugging or added back if other devs need this for some reason.
 2010-12-16 12:48:30 +00:00
Campbell Barton
afacd18498 use lowercase for cmake builtin names and macros, remove contents in else() and endif() which is no longer needed. 2010-12-08 08:43:06 +00:00
Campbell Barton
d64f46e0bb CMake: use a global list to store libraries built rather then cmake_blender_libs.txt file. 2010-12-06 10:56:37 +00:00
Tamito Kajiyama
8a2eb1f590 * Merged changes in the trunk up to revision 33492. 
* Fixed a bug in listing all style modules in source/blender/blenlib/intern/bpath.c.
 2010-12-06 01:23:18 +00:00
Campbell Barton
42d6603cae Add option for CMake to build libredcode, also use CODEC prefix for ffmpeg, quicktime & sndfile options. 2010-11-30 18:52:39 +00:00
Campbell Barton
e8397e6193 include headers in cmake source, added a script to check for consistency, reporting missing headers & C files. 
this is important so IDE's using CMake integration always get blender headers. - QtCreator & MSVC for eg, probably others too.
 2010-11-29 04:35:56 +00:00
Tamito Kajiyama
a04603d2a0 Merged changes in the trunk up to revision 33348. 2010-11-27 12:48:35 +00:00
Campbell Barton
837fedf372 fix for building with mingw/cmake 2010-11-22 23:25:21 +00:00
Campbell Barton
94e17ff01e fix for cmake if build flags are not defined. 2010-11-22 23:06:57 +00:00
Campbell Barton
39b7bfe6bd - check IF WIN32 AND NOT UNIX (for cygwin) 
- patch from Mike S to enable OpenMP and xcode
 2010-11-21 13:41:43 +00:00
Campbell Barton
da1f288f50 rename libs internal libs for CMake + SCons (used in MSVC project files) 
for game engine use "ge_" prefix & make names generally more descriptive.
 2010-11-18 11:42:05 +00:00
Tamito Kajiyama
43f4dbceb4 Merged changes in the trunk up to revision 32886. 2010-11-05 21:49:36 +00:00
Campbell Barton
6b767b8018 fix [#24499] Consistency Issue with LassoSelect/ExtendOption 
Added extend option to lasso. 

also...
- selecting bones wasn't checking their layer of if they were hidden in a number of places.
- fixed memory leak.

small unrealed changes
- added PBONE_VISIBLE macro
- renamed functions used for paint selectoin from *_tface to paintface_*. sine they no longer have anything todo with tface's.
- removed scanfill include from BLI_blenlib.h, this is only used in very few places and quite specific.


Noticed lasso select is broken for metaballs and face mask mode but this has been the case for a while, will look into it next.
 2010-11-03 01:56:02 +00:00
Campbell Barton
0876fce009 rename and negate DISABLE_PYTHON --> WITH_PYTHON 2010-10-31 04:11:39 +00:00
Campbell Barton
50dab4fc37 rename definition for enabling the game engine GAMEBLENDER==1 --> WITH_GAMEENGINE 2010-10-31 03:20:33 +00:00
Campbell Barton
bae43df4ec building the BGE without bullet works again. 2010-10-31 01:04:31 +00:00
Campbell Barton
7f5abb7fe2 dont build blender/kernel if the game engines disabled. 2010-10-31 00:56:46 +00:00
Tamito Kajiyama
3b2515ba0e Merged changes in the trunk up to revision 32684. 2010-10-24 13:05:09 +00:00
Campbell Barton
05b297c52f CMake options to disable Decimate and Boolean Modifiers: WITH_MOD_BOOLEAN, WITH_MOD_DECIMATE, renamed WITH_FLUID to WITH_MOD_FLUID 2010-10-23 15:40:13 +00:00
Nathan Letwory
2a89fb887e * Enable compile and link flags to build info also on Windows and in SCons. 
* Added build_system SCons or CMake
* Write the new build info also to system-info.txt
 2010-10-19 05:00:36 +00:00
Tamito Kajiyama
894daa01be Merged changes in the trunk up to revision 32565. 2010-10-18 20:40:43 +00:00
Campbell Barton
799fc68234 cflags, cxxflags & linkflags in buildinfo. 2010-10-18 12:56:14 +00:00
Campbell Barton
bc1cca8d00 - blender player builds again with CMake. 
- remove duplicate entries for libs for blender binary (where possible)
 2010-10-16 09:27:02 +00:00
Luca Bonavita
9f05cc59fa == docs == 
- moved files in proper directories and adapted paths where needed
- deleted doc/oldbugs.txt (asked confirmation to jesterking a week ago in irc)
- still working on doxygen files, for now I'll leave them in doc/
- NOTE: while checking if other files were referring to these files, I noted that
  "GPL-license.txt" is also used in the files below:
    - release/windows/installer/00.sconsblender.nsi
    - release/windows/specific.sh
  but these files should't be affected by this commit, but please check :)
 2010-10-13 14:44:22 +00:00
Tamito Kajiyama
d7cd6e349d Merged changes in the trunk up to revision 32390. 2010-10-09 22:30:01 +00:00
Campbell Barton
459cf92bf4 build-fix [#24142] path changes break osx 2010-10-05 10:23:25 +00:00
Campbell Barton
0540512866 fix for building over samba /w cmake+mingw 2010-10-04 00:40:48 +00:00
Tamito Kajiyama
854ef17700 Merged changes in the trunk up to revision 32271. 2010-10-03 11:33:32 +00:00
Nathan Letwory
6e41dc8571 CMake on Windows for project files will now copy correct python dll and correct python modules in place. 2010-09-29 11:09:11 +00:00
Tamito Kajiyama
28d618e41b Merged changes in the trunk up to revision 31987. 2010-09-18 00:50:13 +00:00
Campbell Barton
4e9c329faf patch [#23855] fix CMakeList.txt for WITH_QUICKTIME 
from Filiciss Muhgue (filiciss)
 2010-09-17 16:54:59 +00:00
Campbell Barton
d5ee95644d win32 mingw works again with cmake 2010-09-15 14:36:32 +00:00
Campbell Barton
74059891e9 option to disable ITASC IK solver, (will be enabled by default ofcourse) 
- option only available to cmake, scons and make have this enabled always.
- without this clang/llvm can compile blender
- this was the second biggest internal lib, 192mb -> 172mb for all blenders libs (with debug flags), so gives some speedup to linking.
 2010-09-12 12:27:12 +00:00
Tamito Kajiyama
fdb4b0c3ed Merged changes in the trunk up to revision 31880. 2010-09-11 11:16:55 +00:00
Campbell Barton
ecbb170bb0 patch [#23717] Another install target fix for cmake/linux 
from Ralf Hölzemer (cheleb)

 fix for *nix install target
 2010-09-08 03:13:19 +00:00
Campbell Barton
2406ebe1a4 - added back zlib include (needed for win32). 
- use list append in more places.
- remove non existing include dir.
 2010-09-07 01:13:10 +00:00
Tamito Kajiyama
9c6feb1987 * Merged changes in the trunk up to revision 31789. 
* Made a local fix for a compilation error with VC++ 2008 and
CMake, reported to the bf-committers mailing list:
http://lists.blender.org/pipermail/bf-committers/2010-September/028643.html
 2010-09-06 23:26:36 +00:00
Campbell Barton
04b0dcd9e5 - use list append in more places (preferred method since its faster) 
- remove some unused include paths
- remove unused linux path define
 2010-09-06 10:15:41 +00:00
Nathan Letwory
e03437a34a Fix [#23638] Missing directory creation 
Reported and patched by Mariusz Maximus

I overlooked this one while fixing up for win64 compiling, because I had already manually created this directory.
 2010-09-02 22:04:33 +00:00
Nathan Letwory
94d4ff6423 remove debug prints 2010-09-01 06:51:20 +00:00
Nathan Letwory
5241c27594 Python library copying hack. 
When creating project files the multi-configuration generator is used. CMAKE_BUILD_TYPE is then not set, so always release libs were copied.
For now copy both release and debug.
 2010-09-01 06:19:38 +00:00