griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
66,005 Commits 1 Branch 0 Tags
c50ccc847613bbe02bea64cee3f744b449da170c
Commit Graph

1261 Commits

Author SHA1 Message Date
Mike Erwin
825150605e GPU_basic_shader uses GLSL by default 
switch back to old mode at runtime:
blender --enable-legacy-basic-shader
 2016-09-21 20:24:02 +02:00
Sergey Sharybin
d96b8e168f Merge branch 'master' into blender2.8 2016-09-16 17:09:28 +02:00
Sergey Sharybin
83ae39cc2e CMake: Skip addons_contrib for release candidate builds 
Nowadays release candidates are supposed to be as close to the final
release as possible.

Safe for 2.78 release branch.
 2016-09-05 10:14:07 +02:00
Bastien Montagne
3c29aad787 Merge branch 'master' into blender2.8 
Conflicts:
	intern/cycles/blender/blender_particles.cpp
	source/blender/blenkernel/intern/particle.c
	source/blender/gpu/intern/gpu_shader.c
 2016-09-04 16:41:06 +02:00
lazydodo
8fb9f2dbe9 [Windows] Add support for code signing the final binaries. 
The option is controlled with the WITH_WINDOWS_CODESIGN option and needs:

- Signtool must be found on the system, the standard windows sdk folders will be searched for it.
- The path to the pfx file (WINDOWS_CODESIGN_PFX)
- The password for the pfx , this can either be set by the WINDOWS_CODESIGN_PFX_PASSWORD variable but given that ends up in CMakeCache.txt (which might be undesirable) there is a backup option of setting the PFXPASSWORD environment variable on the system.

Reviewers: sergey, juicyfruit

Reviewed By: juicyfruit

Tags: #bf_blender, #platform:_windows

Differential Revision: https://developer.blender.org/D2182
 2016-08-31 06:26:23 -06:00
Kévin Dietrich
62b1cdd66e Fix over creation of cache files handles (leading to memory leaks). 
Multiple threads could create multiple handles for the same cache file,
so protect handle creation with a mutex, to make sure only one is
created.
 2016-08-26 14:28:50 +02:00
Bastien Montagne
b1532493c2 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/blenkernel/BKE_particle.h
	source/blender/blenkernel/intern/library.c
	source/blender/blenkernel/intern/particle.c
 2016-07-25 15:07:17 +02:00
Campbell Barton
a2a1b34cd1 Cleanup: warnings 2016-07-21 07:38:15 +10:00
Campbell Barton
d42cb44ea2 CMake: correct py-module on OSX 2016-07-18 19:30:32 +10:00
Campbell Barton
9186b9ae48 Merge branch 'master' into blender2.8 2016-07-18 19:25:44 +10:00
Sergey Sharybin
af53fee4b4 Make --debug-all include --debug-cycles and --debug-libmv 2016-07-14 12:14:55 +02:00
Campbell Barton
103a515043 CMake: per-target CFLAG & CXXFLAG support 
Applying cflags globally can be problematic especially with extern, intern libs.

Now flags from target named will be used when defined,
allowing for developers to define flags for modules they maintain.

Convention is CMAKE_CFLAGS_${UPPERCASE_TARGET_NAME}, (CXXFLAGS for C++).

eg: CMAKE_CFLAGS_BF_BLENDER, CMAKE_CFLAGS_MAKESDNA, CMAKE_CXXFLAGS_CYCLES_KERNEL

On Linux run `make help` for full list of names, MSVC shows these in the solution.
 2016-07-14 19:17:34 +10:00
Campbell Barton
0708b9aba8 writefile: reuse SDNA between writes 
Avoids decoding the SDNA string every undo step.
 2016-07-12 13:03:04 +10:00
Bastien Montagne
cfbd605567 Merge branch 'master' into blender2.8 
Conflicts:
	intern/cycles/blender/addon/ui.py
	source/blender/blenkernel/BKE_particle.h
	source/blender/blenkernel/intern/dynamicpaint.c
	source/blender/blenkernel/intern/library.c
	source/blender/blenkernel/intern/object.c
	source/blender/blenkernel/intern/particle.c
	source/blender/blenkernel/intern/particle_distribute.c
	source/blender/blenkernel/intern/texture.c
	source/blender/editors/object/object_add.c
	source/blender/editors/object/object_relations.c
	source/blender/editors/physics/particle_edit.c
	source/blender/editors/physics/particle_object.c
	source/blender/editors/transform/transform_snap_object.c
 2016-07-12 00:07:44 +02:00
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