Commit Graph

1152 Commits

Author SHA1 Message Date
Tamito Kajiyama
12f9a5de5b Merged changes in the trunk up to revision 31630. 2010-08-28 14:30:52 +00:00
Campbell Barton
77c7e10e9c apply scons change from r31616 to cmake. 2010-08-27 22:53:48 +00:00
Campbell Barton
6464718083 rename some cmake build targets 2010-08-24 04:29:23 +00:00
Tamito Kajiyama
f5247d9425 Fix for a linkage issue with CMake on Linux. 2010-08-18 04:15:14 +00:00
Tamito Kajiyama
92478de0eb Merged changes in the trunk up to revision 31403. 2010-08-17 07:10:03 +00:00
Joerg Mueller
0be08725ad Py API (GSoC): Second merging commit
Rough summary of fixes/changes:
- Blender Py API: GameLogic -> bge.logic
- Blender Py API: Implemented missing KX_PYATTRIBUTE_TODOs and -DUMMYs.
- Fix for [#22924] KX_PolygonMaterial.diffuse does not return expected list[r,g,b]
- Py API: Renaming _owner attribute of mathutils classes to owner.
- Fix some minor errors in mathutils and blf.
- Enabling game engine autoplay again based on a patch by Dalai:
  * The biggest 3D view in the open scene is used, if there is none, blender opens the file normally and raises an error.
  * The 3D view are is made fullscreen.
  * Quad view, header, properties and toolbox panel are all hidden to get the maximum view.
  * If the game engine full screen setting is set, the game starts in fullscreen.
- Fix for ipo conversion on file transition in the game engine.
2010-08-16 12:14:09 +00:00
Tamito Kajiyama
1a875f915d Merged changes in the trunk up to revision 31284. 2010-08-12 13:41:59 +00:00
Guillermo S. Romero
95aa8cfa4a Update address in license block. 2010-08-10 21:22:26 +00:00
Tamito Kajiyama
dd75ec4907 Merged changes in the trunk up to revision 31190. 2010-08-09 11:32:55 +00:00
Brecht Van Lommel
27a0b9bef3 Fix #23099: cmake/mac did not copy the scripts/ directory correct for install. 2010-08-04 16:05:19 +00:00
Stefan Gartner
2f8f86e4f6 fix path to release/python.zip for scons and cmake
I hope this doesn't break anything
2010-08-04 11:07:14 +00:00
Campbell Barton
957976882d build options to disable image formats WITH_CINEON, WITH_HDR.
- updated cmake, make & scons.
- renamed CMake build options WITH_TIFF -> WITH_IMAGE_TIFF, same for DDS, OPENJPEG etc.
2010-08-03 11:25:34 +00:00
Campbell Barton
ec2c52c9c8 SCons
- remove scons option WITH_BF_FHS, its not needed anymore.
- comment WITH_BF_DOCS, was using epydocs which we dont use now.
- blenderlite target was broken, always using openmp.
- building without python wasnt working.

- fixed some warnings.
2010-08-02 16:27:41 +00:00
Campbell Barton
7bd687ea58 cmake
- more strict warnings for gcc/unix, still <50 for a clean build.
- install files to /usr/local/share/blender/2.53 rather then /usr/local/share/blender/.blender
2010-08-02 16:23:58 +00:00
Tamito Kajiyama
a5692fd67b Merged changes in the trunk up to revision 30952. 2010-08-01 23:37:52 +00:00
Brecht Van Lommel
f3cca3e192 2.5: more G.main changes. 2010-08-01 12:57:01 +00:00
Brecht Van Lommel
5fa7d1c1b4 2.5: code changes to reduce the usage of G.main and pass it along
or get it from the context instead.
2010-08-01 12:47:49 +00:00
Tamito Kajiyama
be2e221608 Merged changes in the trunk up to revision 30781. 2010-07-27 00:08:15 +00:00
Campbell Barton
00149cfb9d patch [#23041] CMake WITH_PYTHON_INSTALL option
from Dan Eicher (dna)

--- snip ---
Adds the option to not copy python into the .blender/python directory.

Also fixes the problem of deleting the blender installed python where the blender runtime only looks for the copied python and not the system one but not entirely sure why, something to do with CMake hardcoding the PYTHONPATH and PYTHONHOME vars I suppose.

This patch only applies to the 'UNIX AND NOT APPLE' platforms but, then again, those are the only ones anyone really
cares about...or at least the only ones where using the system python is really viable.
2010-07-26 23:16:21 +00:00
Campbell Barton
f30c12bcab patch [#23039] cmake install taget fix for brush icons on linux
from Ralf Hölzemer (cheleb)
2010-07-26 19:59:33 +00:00
Campbell Barton
bed40ed8e3 move directories:
dlltool --> build_files/make/dlltool
 bin --> release/bin
 
Since dlltool is only used make + mingw and ./bin is misleading because it would seem the blender binary would be copied there, but its just used for home directory files.

updated scons/cmake/make
2010-07-26 11:47:33 +00:00
Joseph Eagar
8bcb71aebd [finally! the commit went through]
=bmesh=

First pass at post-merge stabilization.  Seems to work well enough now, but
I need to do more testing.  Also need to go through bmesh_class.h and make
sure the design/headers there make sense.
2010-07-22 00:18:35 +00:00
Tamito Kajiyama
e423e085f8 Merged changes in the trunk up to revision 30551. 2010-07-20 19:39:07 +00:00
Joseph Eagar
c11c196efa part 1 of merge from trunk at r30358; it compiles, but doesn't link quite yet :) 2010-07-19 04:44:37 +00:00
Campbell Barton
0a2e485926 move the thumbnailer to bin/ 2010-07-18 11:46:25 +00:00
Campbell Barton
40078f22b2 CMake on unix
- install manpage into the correct location defined: http://www.pathname.com/fhs/2.2/fhs-4.11.html
- dont copy pyc files from release/scripts
2010-07-17 21:11:04 +00:00
Tamito Kajiyama
2df7f76e78 Merged changes in the trunk up to revision 30397. 2010-07-15 21:05:11 +00:00
Andrea Weikert
05fb497f75 == installation paths ==
remove deprecated python BLI_gethome_folder calls

Patch by Brecht, thanks a lot
2010-07-15 20:02:53 +00:00
Campbell Barton
7fc9eee08a - updated man page from --help output.
- cmake now installs the man page.
- added cmake_linux_install.sh, shell script which downloads and builds blender.
2010-07-15 19:58:23 +00:00
Brecht Van Lommel
7fb16fb5ec Update --help message for new path environment variables. 2010-07-15 15:20:53 +00:00
Campbell Barton
5daf9354d2 change some references to .B.blend, .Blog to new names 2010-07-15 11:51:43 +00:00
Joseph Eagar
a37bcf93ef wip commit; DO NOT USE. almost done with phase 1 of this restructuring, basically just some things that needed to be done before trunk (and some things that needed to be started, but can be finished much later). 2010-07-14 22:06:10 +00:00
Campbell Barton
1bb789956d CMake patch from Ralf Hölzemer (cheleb)
[#22849] Fix cmake install target on linux
--- from the tracker ---
This patch fixes the install target for the linux platform. Since the new configuration path changes are in effect, files have to be installed in the correct places instead of just copying the local installation to $PREFIX/share/blender.

It also provides a new macro to determine the correct blender version values.

Changes in this patch include:

- the .desktop menu file is installed in $PREFIX/share/applications and points to the svg icon instead of a png one, which is also installed in $PREFIX/share/pixmaps
- docs are installed in $PREFIX/share/doc/blender
- scripts are installed in in $PREFIX/share/blender/x.xx/
- locales are installed in in $PREFIX/share/blender/x.xx/datafiles
- a new cmake macro determines and sets the correct values for BLENDER_VERSION_MAJOR, BLENDER_VERSION_MINOR, BLENDER_SUBVERSION, BLENDER_VERSION, BLENDER_MINVERSION_MAJOR, BLENDER_MINVERSION_MINOR, BLENDER_MINSUBVERSION and BLENDER_MINVERSION by parsing source/blender/blenkernel/BKE_blender.h and calculating major/minor values. This replaces the hardcoded value in the top CMakeLists file and is used by all platforms.
2010-07-14 20:26:46 +00:00
Tamito Kajiyama
f588c49cb5 Merged changes in the trunk up to revision 30335. 2010-07-14 19:01:40 +00:00
Campbell Barton
834f2a42ce - sequencer wasnt drawing handles, the deprecated v2d was being used which gave a pixely of -nan.
- removed bf_editors from cmake since there now split up.
2010-07-11 12:39:50 +00:00
Tamito Kajiyama
b8de9bc5fb Merged changes in the trunk up to revision 29994. 2010-07-05 18:37:29 +00:00
Campbell Barton
9c4e3a7b6b bugfix [#22724] "Scene" switch on the console doesn't work 2010-07-05 00:00:40 +00:00
Campbell Barton
66a72343ef fix for building with cmake 2010-07-04 22:43:51 +00:00
Andrea Weikert
ca81aa704e Patch [#22339] File/installation paths changes
Patch Tracker: http://projects.blender.org/tracker/?func=detail&aid=22339&group_id=9&atid=127

This patch implements the proposal outlined here:
http://wiki.blender.org/index.php/Dev:2.5/Source/Installation/Proposal

Original patch by Matt Ebb.
Contributions by Nathan Letwory, Damien Plisson and Andrea Weikert

NOTE:
This is a work in progress commit, some work still needs to be done on the SCons and CMake files for this to work properly, but at least should compile and the files should be created in the right directory.

Commit discussed on IRC with Ton and Campbell.
2010-07-04 15:35:23 +00:00
Campbell Barton
ea4e5a08cd script to create a man page from blenders --help text, replaced the hand edited man page with this. 2010-06-27 00:33:12 +00:00
Tamito Kajiyama
cb805085ef Merged changes in the trunk up to revision 29702. 2010-06-26 13:39:43 +00:00
Campbell Barton
9e87433ef2 error in last commit 2010-06-25 12:13:29 +00:00
Campbell Barton
044a20821b extend command line argument for rendering the current frame
blender --background some.blend --render-frame 1 # renders frame 1
 blender --background some.blend --render-frame +0 # renders the first frame
 blender --background some.blend --render-frame -1 # renders the last frame
2010-06-25 11:56:12 +00:00
Tamito Kajiyama
df0b629e24 Merged changes in the trunk up to revision 29409. 2010-06-11 17:17:02 +00:00
Campbell Barton
d153c765bc CMake:
- WITH_LCMS added option, was supported in scons.
- commented web plugin option since its not maintained.
- some formatting changes and removed includes that are not needed for source/creator/CMakeLists.txt.
2010-06-06 13:32:58 +00:00
Campbell Barton
55d3a2014c have cmake build editors as different libs like scons and nan-makefiles 2010-06-04 11:34:57 +00:00
Campbell Barton
b9cb3c91a8 remove unused env vars from --help 2010-06-03 20:06:29 +00:00
Tamito Kajiyama
ca6f7ddd99 Merged changes in the trunk up to revision 29184. 2010-06-03 15:39:02 +00:00
Campbell Barton
1658a28a58 - Python console argument '--python-console', option so you can start blender and drop into a python console, (useful for debugging some problems on a renderfarm over ssh)
- Also made it so sys.stdin isnt overwritten anymore, instead the interactive consoel overwrites while it executes and restores after.

- removed hope folder from sphinx patch path
2010-05-30 14:05:58 +00:00
Tamito Kajiyama
8fe1d461e3 Merged changes in the trunk up to revision 29069. 2010-05-29 23:31:11 +00:00