Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
85,558 Commits 2 Branches 0 Tags
ee099d5624088ffbfe933770b212e89a4531dbcf
Commit Graph

1447 Commits

Author SHA1 Message Date
Campbell Barton
9d5661c9e8 CMake: list buildinfo.h as buildinfo.cmake's output 
Keep the fake header to ensure we always run.
 2016-06-30 08:53:25 +10:00
Bastien Montagne
cbce7fef16 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/blenkernel/intern/pointcache.c
	source/blender/makesrna/intern/rna_main_api.c
	source/blender/makesrna/intern/rna_particle.c
 2016-06-27 15:59:01 +02:00
Campbell Barton
bfcf8c8e03 CMake: exclude gitignore & arcconfig for addons 
These files were included in releases
 2016-06-25 21:57:54 +10:00
Jens Verwiebe
28dbd572a4 Exclude obsolete static pythonlibs from install 2016-06-25 12:40:19 +02:00
Campbell Barton
823ab66eca Avoid memory leaks on exit during argument parsing 
Exiting Blender during argument parsing would leak memory
(tests, documentation generation, utilities).

While harmless, it hides real leaks which should be resolved.
 2016-06-24 10:05:23 +10:00
Campbell Barton
10d57f991b Merge branch 'master' into blender2.8 2016-06-10 05:15:06 +10:00
Campbell Barton
cf8a0d08b0 GPU: make using the glsl basic-shader a flag 
This allows for it to be more easily tested.
 2016-06-08 04:13:16 +10:00
Bastien Montagne
24d29f2e50 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/blenkernel/intern/particle.c
	source/blender/editors/transform/transform_snap_object.c
 2016-06-07 09:59:26 +02:00
Martijn Berger
50f432b1e0 CMake, minor changes to make Visual studio 2015 use a compatible numpy and 
the standard cmake CUDA/NVCC arguments flag allowing 2015 build to use
msvc 2013 for cuda
 2016-06-04 11:42:48 +02:00
Campbell Barton
d931e958a1 Minor changes to help text 
D2040 by @Blendify, also move 'Experimental Features' above more general help text.
 2016-06-02 15:29:53 +10:00
Bastien Montagne
faec430914 Merge branch 'master' into blender2.8 
Conflicts:
	intern/cycles/blender/blender_curves.cpp
	source/blender/blenkernel/intern/dynamicpaint.c
	source/blender/blenkernel/intern/particle.c
	source/blender/blenloader/intern/versioning_270.c
	source/blender/editors/physics/particle_edit.c
	source/blender/editors/transform/transform_snap_object.c
	source/blender/editors/util/undo.c
	source/blender/makesrna/intern/rna_object_force.c
 2016-05-24 16:48:10 +02:00
Campbell Barton
4adffde02c Cleanup: cmake, indentation, line length 2016-05-18 11:58:08 +10:00
Campbell Barton
fbbac6807a Cleanup: unused win32 headers 2016-05-12 04:35:40 +10:00
Campbell Barton
a18f4d2bc6 CMake: optional date/time overrides for reproducible builds 2016-05-11 02:47:38 +10:00
Lukas Tönne
1f723603c8 Merge branch 'master' into temp_remove_particles 2016-04-28 17:33:19 +02:00
Campbell Barton
6976be7723 Python: install pyconfig.h on OSX, needed for PIP 2016-04-28 20:46:58 +10:00
Campbell Barton
beaa57d269 Refactor BKE_blender into separate headers 
- BKE_blender_version.h (only version defines & versionstr).
- BKE_blender_copybuffer.h (currently only used for view3d copy/paste).
- BKE_blender_undo.h (global undo functions).
- BKE_blendfile.h (high level blend file read/write API).
 2016-04-25 19:27:45 +10:00
Lukas Tönne
fbed29a246 Merge branch 'master' into temp_remove_particles 2016-04-15 17:59:54 +02:00
Lukas Tönne
d47173c8ca Removed blenkernel particle code. 2016-04-13 10:49:39 +02:00
Campbell Barton
3a977ff502 Missed last commit 2016-04-13 00:49:47 +10:00
Campbell Barton
28dad2ec12 Correct error checking for wrong frame range 2016-04-06 09:41:30 +10:00
Campbell Barton
cc970dc08a Cleanup: arg docstrings 2016-04-06 09:28:22 +10:00
Campbell Barton
16f919ea58 Render frame arg parsing, list and range support 
Support a comma separated list of frames, as well as frame ranges using the '..' separator.

eg: `blender my.blend --render-frame 1,2,10..40,100..200`
 2016-04-06 09:23:15 +10:00
Martijn Berger
de6af2f02a Remove the obsolete windows launcher 2016-03-31 14:07:57 +02:00
Martijn Berger
c0cb9d75d6 CMAKE disable building the windows launcher, fix type in delayloading of debug dll 2016-03-31 14:05:46 +02:00
Martijn Berger
4ec95d621a CMAKE / msvc openmp, delay loading of openmp dll so we can set environment 
variable before it is loaded
 2016-03-31 13:46:14 +02:00
Sergey Sharybin
3237ae2855 Add license text for OCIO configuration 2016-03-29 12:54:29 +02:00
Sybren A. Stüvel
9f8311ee88 Include requests' cacert.pem file 
This allows us to verify certificates of HTTPS connections, which is
mandatory for logins like on Blender ID.

Reviewers: campbellbarton

Differential Revision: https://developer.blender.org/D1845
 2016-03-11 07:58:05 +01:00
Campbell Barton
c38087afc0 Correct image format args (remove 'MOVIE') 2016-03-04 06:36:13 +11:00
Campbell Barton
8fa1d70543 Cleanup: comments for creator_args & line length 2016-03-03 12:36:33 +11:00
Campbell Barton
c593b77910 Cleanup: style, and --help edits 2016-03-02 17:01:38 +11:00
Campbell Barton
a19c278551 Include modules needed for Python to run pip 
This means Python developers can install pip using Blender's bundled Python.
 2016-03-01 07:37:49 +11:00
Campbell Barton
6e66ffb61a Cleanup split creator.c 
creator.c was getting hard to follow.

- Split off argument and signal handling into own files.
- Move docstrings next to functions (to keep docs grouped with code).
 2016-02-28 05:23:48 +11:00
Martijn Berger
e24323ea40 Actually only remove sqlite dll 2016-02-18 10:53:55 +01:00
Martijn Berger
dde810c268 Revert "Fix: T46526, Do not try to install sqlite3.dll anymore as we link it statically into pythons _sqlite" 
This reverts commit a8e6b633c9.
 2016-02-18 10:53:54 +01:00
Martijn Berger
a8e6b633c9 Fix: T46526, Do not try to install sqlite3.dll anymore as we link it statically into pythons _sqlite 2016-02-18 08:19:14 +01:00
Campbell Barton
3d24e57ce8 CMake: install python as an executable 2016-02-15 18:45:32 +11:00
Campbell Barton
bd60920576 Revert "CMake: remove ".svn" checks" 
This reverts commit 00fbc326e3.

Still needed for svn <1.8
 2016-02-11 19:14:59 +11:00
Campbell Barton
00fbc326e3 CMake: remove ".svn" checks 2016-02-11 16:00:19 +11:00
Campbell Barton
8be34580c1 move windows out of source dir 2016-02-07 20:58:58 +11:00
Sergey Sharybin
8aef306a42 CMake: Attempt to fix wrong installation folder for requests on OSX 2016-02-01 10:38:34 +01:00
Campbell Barton
161e2343b7 Cleanup: minmac -> minmax & RE_render_ext naming 
Use more conventional API word-ordering for RE_render_ext
 2016-01-27 07:37:33 +11:00
Campbell Barton
2ca34e419e Docs: minor edits to code comments 2016-01-24 14:29:14 +11:00
Campbell Barton
f81bc88ac7 Fix crash w/ scripts run from the command line that load files 
Also refactor context backup/restore into functions.
 2016-01-15 10:23:26 +11:00
Campbell Barton
c42ae8be60 CMake: copy python DLL for MinGW builds 2016-01-05 22:13:36 +11:00
Sergey Sharybin
ba432299cd Move Libmv from extern/ to intern/ 
Logically it is intern library since being mainly developed by 1.5 blender guys.
 2016-01-04 19:39:13 +05:00
Sergey Sharybin
5d99cde822 Remove SCons building system 
While SCons building system was serving us really good for ages it's no longer
having much attention by the developers and started to become quite a difficult
task to maintain.

What's even worse -- there started to be quite serious divergence between SCons
and CMake which was only accumulating over the releases now. The fact that none
of the active developers are really using SCons and that our main studio is also
using CMake spotting bugs in the SCons builds became quite a difficult task and
we aren't always spotting them in time.

Meanwhile CMake became really mature building system which is available on every
platform we support and arguably it's also easier and more robust to use.

This commit includes:

- Removal of actual SCons building system
- Removal of SCons git submodule
- Removal of documentation which is stored in the sources and covers SCons
- Tweaks to the buildbot master to stop using SCons submodule
  (this change requires deploying to the server)
- Tweaks to the install dependencies script to skip installing or mentioning
  SCons building system
- Tweaks to various helper scripts to avoid mention of SCons folders/files
  as well

Reviewers: mont29, dingto, dfelinto, lukastoenne, lukasstockner97, brecht, Severin, merwin, aligorith, psy-fi, campbellbarton, juicyfruit

Reviewed By: campbellbarton, juicyfruit

Differential Revision: https://developer.blender.org/D1680
 2016-01-04 14:20:48 +05:00
Sergey Sharybin
702372f6c5 Fix wrong format used in the recent python exit code commit 2015-12-31 18:02:54 +05:00
Campbell Barton
82a1adfbdf Command line argument to exit on Python errors 
eg:
  blender -b --python-exit-code 1 --python script.py --render-anim

This causes blender not to continue parsing command line arguments and exit if the script raises an exception.
 2015-12-31 22:37:32 +11:00
Campbell Barton
3236f1ab54 Add parse_int_strict_range utility for command line input 2015-12-31 22:37:32 +11:00