kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
29,489 Commits 2 Branches 0 Tags 753 MiB
69f9104ea7
Commit Graph

87 Commits

Author SHA1 Message Date
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
Guillermo S. Romero
4b4281f2e2 SVN maintenance. 2011-02-25 00:02:08 +00:00
Campbell Barton
b8e3f4ee30 fix for cmake not having the correct svn revision in buildinfo, now generate a header every build with the time, date, svn revision. 2011-02-24 17:57:35 +00:00
Campbell Barton
12e4c52c5a cmake was using dna source list with the variable out of scope, possibly causing dependency problems. 2011-02-22 06:23:07 +00:00
Campbell Barton
72d5d692ea better macro for getting the blender version from BKE_blender.h, also re-run CMake if BKE_blender.h changes. 2011-02-21 08:31:00 +00:00
Campbell Barton
ff84ad3151 fix for cmake with last commit. 2011-02-21 05:28:22 +00:00
Campbell Barton
7809d7d0c8 fix [#26152] Blender File for Image too Small 
disallow 0% rendersize.

also mark new cmake vars as advanced: RPMBUILD, X11_XF86keysym_INCLUDE_PATH
 2011-02-21 01:02:30 +00:00
Campbell Barton
c30149991c Experimental option to build blender as a python module, rather then blender embedding python. 
CMake build option WITH_PYTHON_MODULE, will build ./bin/bpy.so

This allows 'bpy' to be imported from python or other applications/IDE's which embed python, eg:
   python -c "import bpy ; bpy.ops.render.render(write_still=True)"

This runs in background mode and has similar restrictions to running a script:
   blender --background --python test.py

TODO:
 - install to site-packages with blender scripts
 - add support for imp.reload()
 2011-02-20 23:39:29 +00:00
Campbell Barton
0927ad8f4c CMake: remove workaround for cmake 2.8.3 problem testing -Werror=strict-prototypes flag (now 2.8.4 is out). 
This is harmless, CMake 2.8.3 just wont build with -Werror=strict-prototypes which is nice for picky devs.
 2011-02-17 11:38:02 +00:00
Campbell Barton
812f238494 pep8 cleanup and remove unused vars/imports 2011-02-17 04:35:41 +00:00
Campbell Barton
fee5363912 bugfix [#26094] Going to Bone Roll menu brings up python error 
also correct for pep8 warnings.
 2011-02-16 02:25:03 +00:00
Campbell Barton
c461a7ea4d patch from IRIE Shinsuke, use systems openjpeg on *nix. 2011-02-15 19:04:51 +00:00
Campbell Barton
52c08fa4d3 CPack packaging support from Dan Eicher, tested to build redhat RPM's, a Mac bundle also defined. 2011-02-15 18:33:05 +00:00
Campbell Barton
736a7b7a22 pep8 cleanup 2011-02-04 09:27:25 +00:00
Campbell Barton
7a23193811 cmake attempted fix before didnt work (I cant test on OSX), this should fix. 2011-01-26 07:34:17 +00:00
Campbell Barton
fb08dc11e3 missed this when updating cmake files 2011-01-26 04:48:37 +00:00
Campbell Barton
1bd0db59f4 use cmake defined names for jpeg, png, zlib and python libs, building on *nix with non-standard libjpeg/png/zlib locations was broken. 
in the case of python this makes it easier to move to find_package(PythonLibs) when 3.x is supported.
 2011-01-25 14:43:13 +00:00
Campbell Barton
da2b490198 cmake maintenance, was missing 2 headers and made some minor improvements to cmake_consistency_check.py. 
also converted GHOST_SystemWin32.cpp to utf8.
 2011-01-25 08:35:10 +00:00