bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity
30,154 Commits 2 Branches 0 Tags 745 MiB
4f3936083a
Commit Graph

104 Commits

Author SHA1 Message Date
Campbell Barton
4f3936083a replace own inline cmake include search logic for a typical FindXXX.cmake module. 2011-06-15 12:09:02 +00:00
Campbell Barton
1243992f27 cmake: correct uninitialized vars 2011-06-14 00:24:50 +00:00
Campbell Barton
fedc811014 minor updates to the cmake checker 2011-06-13 03:09:14 +00:00
Campbell Barton
c2e1f3a1e2 fix for using system includes, the include macro wasn't un-setting the previous include list so system includes could be mixed up with non system includes. 
Also workaround for CMake 2.8.4 & GNU-Make which doesn't set CMAKE_INCLUDE_SYSTEM_FLAG_C
 2011-06-11 06:00:28 +00:00
Campbell Barton
9cf0bbb95c added a check to console auto-compleation for pythons struct_seq type, so bpy.app and sys.float_info autocompleate their attributes rather then bring treated as a typle. 2011-06-10 09:44:27 +00:00
Campbell Barton
09da9d4393 cmake maintenance 
blender_add_lib now takes a separate include argument to suppress warnings in system includes (mostly ffmpeg & python).
also only build wm_apple.c on apple+carbon configuration.
 2011-05-31 01:15:44 +00:00
Campbell Barton
20ae95422e include ffmpeg_compat header in cmake source list. 2011-05-28 04:53:17 +00:00
Campbell Barton
26252bb315 correct spelling error and some pep8 changes. 2011-05-26 09:33:51 +00:00
Campbell Barton
b69c1e8f1a CMake changes 
- don't allow building if the LIBDIR is not found on mac/windows.
- by default use -O2 rather then -O3 for GCC release flags, was crashing some GCC versions and blender releases are supposed to use -O2.
 2011-05-23 14:56:14 +00:00
Campbell Barton
0858904571 fix [#27414] no-material renders differently in View3D vs BGE 
when a texface layer exists this still overrides the default material.
 2011-05-17 02:44:52 +00:00
Brecht Van Lommel
b434e7f933 LCMS code removed, was an experiment but never finished. 2011-05-16 13:34:42 +00:00
Campbell Barton
5cfc13a11d fixed incorrect jemalloc library & updated netbeans project to ignore __pycache__. 2011-05-16 10:34:40 +00:00
Guillermo S. Romero
9b236a7a12 SVN maintenance. 2011-05-16 06:11:14 +00:00
Campbell Barton
0460a68ae7 made generic module for generating project files from cmake, 
added netbeans project file generator.
 2011-05-16 04:04:06 +00:00
Campbell Barton
424a0cca27 option to link with jemalloc on *nix, off by default. 2011-05-12 11:16:32 +00:00
Campbell Barton
2e3538cf24 patch from Dan Eicher for cpack rpms 2011-05-10 21:59:11 +00:00
Campbell Barton
770119d16f patch from Dan Eicher, CPack/RPM working again 2011-05-06 23:59:15 +00:00
Campbell Barton
f0b45cc1fb - fix for cmake when there is no version character. 
- link to release docs correctly from the splash page.
 2011-04-12 16:20:41 +00:00
Campbell Barton
a42bf45333 revert Joseph Eagar's eltopo commits r36073, 36075 (& some minor edits) 
discussed with Janne, Ton, Nathan and we agreed this kind of change at least needs discussion with module owners.

Its also too close to release to be making these kinds of changes.

commands used:

  # reverse merge
  svn merge -r36073:36072 .
  # for some reason this gave a lot of property changes
  svn revert `svn st | grep "^ M" | awk '{print $2}'`
  # reverse merging didn't work here, removing while dir.
  svn rm extern/eltopo/


  # manually fixed conflict in
  # ./source/blenderplayer/CMakeLists.txt
  #
  # also manually removed 2 lines from
  # ./CMakeLists.txt
 2011-04-12 11:09:10 +00:00
Campbell Barton
28594bc742 minor pep8 edits, also added 'test_pep8' & 'test_cmake' to the GNUmakefile for convenience. 2011-04-10 10:45:56 +00:00
Joseph Eagar
0a60bc14d6 =cloth collisions= 
Plugged the eltopo library into the cloth solver.
I was playing with it earlier, and it's so easy to
use I decided to quickly put it in (trunk's) cloth.

See http://www.cs.ubc.ca/labs/imager/tr/2009/eltopo/eltopo.html
.  The authors are on the bleeding edge of continuous collision
detection (one of them did ILM's cloth sim).  
I
don't really have to time to plug it into softbody, particles,
bullet, fluid, etc, but doing so would be pretty straightforward.
I'll leave that up to someone else.

To use, turn on USE_ELTOPO (in cmake) or WITH_BF_ELTOPO in scons.
 2011-04-09 23:19:11 +00:00
Campbell Barton
5c7bed92d4 fix for cmake glew includes (tested with mingw), also made qtcreator project generator work with mingw again 2011-04-06 03:02:40 +00:00
Guillermo S. Romero
d00501dfd0 SVN maintenance. 2011-04-06 00:22:44 +00:00
Campbell Barton
ca254dd37b add option WITH_BUILTIN_GLEW, so linux packagers can disable to use their own glew library. 2011-04-05 23:31:01 +00:00
Campbell Barton
162d02bf50 quiet warning & minor pep8 edits. 2011-04-04 22:42:43 +00:00
Campbell Barton
744a3b9cb2 fix cmake for when BLENDER_VERSION_CHAR is not set. 2011-04-03 07:48:33 +00:00
Campbell Barton
c8652b301f pep8 checker, mostly pedantic style changes but also found an error in mesh_utils.mesh_linked_faces() 2011-04-01 02:41:15 +00:00
Campbell Barton
aa2269e065 remove DEBUG flag from OpenNL with cmake, was giving too many prints in the console when unwrapping. 2011-03-29 11:50:37 +00:00
Campbell Barton
50a06eccff pep8 cleanup 2011-03-27 05:23:14 +00:00
Campbell Barton
f08a227f93 include gcc builtin defines in qtcreator project file (__VERSION__, __x86_64__, __linux__ etc) 2011-03-25 12:42:33 +00:00
Campbell Barton
19819dcbc7 write project files into the build dir. 2011-03-24 10:54:42 +00:00
M.G. Kishalmi
0c9488b2f3 the script is now creating 2 project files: 
Blender.creator
Blender_Python.creator

.glsl files have been added to the former
latter contains everything .py
 2011-03-24 08:33:42 +00:00
Campbell Barton
c210b3991a support for blender as a module on win32. 2011-03-24 00:14:49 +00:00
Brecht Van Lommel
f0d7fbc4b7 CMake package_archive target to create a .zip/.tar.bz2 package on mac/unix, 
to be used by buildbot.
 2011-03-21 16:42:21 +00:00
Brecht Van Lommel
bcee2343ea Mac OS X cmake changes and bundle fixes 
For cmake users, you should now use "make install" instead of "make". This was
already changed for Linux and Windows. Same for Xcode, use the install target.

Changes:
* CMake install mechanism, resulting bundle was verified to be indentical here.
* For cmake, include Info.plist in bundle using builtin mechanism for that.
  There was some code in packaging.cmake, but it wasn't correct as these
  properties need to be set on the executable.
* For scons, fix app bundle version, was still using removed release/VERSION.
* Remove unused blendercreator.app and blenderpublisher.app.
* Fix Info.plist being set as a binary file in svn, should be plain text.
 2011-03-16 15:44:17 +00:00
Campbell Barton
82783cd0cd pep8 edits and remove commented code from last commit. 2011-03-14 23:17:52 +00:00
Campbell Barton
60fe23b100 cmake, search $HOME/py32 for python now too. 2011-03-12 04:39:43 +00:00
Campbell Barton
f3a455fd22 CMake should find python now without manual options being set on linux. 
cmake on *nix detects python ABI flags for debug and release mode.
searches /usr /usr/local /opt/py32
 2011-03-10 00:25:35 +00:00
Campbell Barton
e7bf671e25 se BLI_snprintf() for msvc compat, cleanup CMake file, some bad comments left in. 
also on only try build RPM's on linux.
 2011-03-07 03:57:04 +00:00
Campbell Barton
3326c0ca75 fix for invalid empty string check in uniquename callback. 2011-03-03 17:23:59 +00:00
Campbell Barton
aec6020376 added support for windows/mingw 2011-03-03 15:38:29 +00:00
Campbell Barton
c7dc8ddf7d fix error in qtcreator project file arg checking and check for cmake files. 2011-03-03 11:22:54 +00:00
Campbell Barton
fa42cf671a git users complain this breaks for them 2011-02-28 19:48:56 +00:00
Campbell Barton
f73c993b16 - use Py_CLEAR for python internally referencing other PyObjects (supposed to be safer). 
- detect includes for qtcreator projects as well as the ones from cmake (it didnt return all of the right paths).
 2011-02-27 04:01:58 +00:00
Campbell Barton
61235fcc8a fix for 'live edit', running python scripts as you type 
- errors would jump to the line which gets in the way.
- the window wouldn't always redraw.
 2011-02-26 15:30:38 +00:00
Campbell Barton
34abccc0ab qtcreator project generator now includes defines and correct include paths. 2011-02-26 11:18:36 +00:00
Campbell Barton
6a25ecb799 recent changes to svn broke rpm builder, also include rpm version info 2011-02-26 06:27:54 +00:00
Campbell Barton
e06eea4fba fix for scons with recent change to how BINRELOC is enabled via cmake. 
also add WITH_PYTHON define to qtcreator project generator until we get a way to add them properly.
 2011-02-25 14:45:45 +00:00
Guillermo S. Romero
5005853d40 Fix buildinfo, as pointed by IRIE Shinsuke. 
Added a note about doubtful "copy if different".
 2011-02-25 06:03:01 +00:00
Guillermo S. Romero
aa9c91f01a Make buildinfo not fail with git-svn as suggested by Nicholas Bishop. 
Improve formating and comments a bit.
 2011-02-25 04:02:58 +00:00