griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
76,988 Commits 1 Branch 0 Tags
5a82aee9e69ddcfbd4ca704f6566cf7eeec97dec
Commit Graph

76988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bastien Montagne
5a82aee9e6 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/alembic/intern/abc_exporter.cc
	source/blender/blenkernel/BKE_mball.h
	source/blender/blenkernel/intern/depsgraph.c
	source/blender/blenkernel/intern/mball.c
	source/blender/editors/object/object_add.c
	source/blender/render/intern/source/convertblender.c
 2018-05-31 16:57:39 +02:00
Campbell Barton
8d53e8cd02 UI: hide user preferences from space menu 
See T54744
 2018-05-31 16:46:24 +02:00
Bastien Montagne
da11e33b26 Cleanup: remove G.main from BKE mball code. 2018-05-31 16:44:05 +02:00
Campbell Barton
361b3eb88e Cleanup: warning 2018-05-31 16:36:24 +02:00
Bastien Montagne
eb1feb9f4a Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/object/object_add.c
	source/blender/editors/object/object_select.c
	source/blender/editors/space_outliner/outliner_edit.c
 2018-05-31 16:21:47 +02:00
Pablo Vazquez
0b396bc15b Minor tweaks to labels 2018-05-31 16:05:47 +02:00
Bastien Montagne
16100f8261 Cleanup: get rid of last G.main usages in BKE library code. 2018-05-31 16:04:04 +02:00
Bastien Montagne
b809340960 Merge branch 'master' into blender2.8 
Conflicts:
	intern/cycles/blender/blender_curves.cpp
	source/blender/blenkernel/BKE_particle.h
	source/blender/blenkernel/intern/modifier.c
	source/blender/blenkernel/intern/object_update.c
	source/blender/blenkernel/intern/particle_system.c
	source/blender/editors/object/object_modifier.c
	source/blender/editors/physics/physics_fluid.c
	source/blender/makesrna/intern/rna_particle.c
	source/blender/modifiers/intern/MOD_particlesystem.c
 2018-05-31 15:37:15 +02:00
Bastien Montagne
b53d358261 Cleanup: remove G.main from BKE modifier. 2018-05-31 15:24:30 +02:00
Sergey Sharybin
3248ac5e83 Cleanup: Remove unused variable 2018-05-31 15:02:12 +02:00
Dalai Felinto
25e5ec245c Support Move / Link to collection in the outliner as well 2018-05-31 14:52:05 +02:00
Dalai Felinto
d0af8edcd1 Outliner: Expose collections editors poll in ED_outliner.h 2018-05-31 14:52:05 +02:00
Dalai Felinto
eaad4caa56 Link to Collection - Add shortcut (Shift + M) 2018-05-31 14:52:05 +02:00
Joshua Leung
54e92bbd29 Fix: View All in Action Editor zoomed in far enough to enter "crazy mode" with a single keyframe 
Now, when there's just a single keyframe, pressing HomeKey will instead
just center the view instead of trying to do "frame range" + margin.
 2018-05-31 14:51:28 +02:00
Sybren A. Stüvel
4e96bff938 Update CoW when adding/removing pose in pose library 2018-05-31 13:53:40 +02:00
Joshua Leung
f56a9fbad5 Depsgraph: Remove the "disable-copy-on-write" option completely 
After discussion with Sergey and Dalai, we have decided to remove
this option completely. We're getting to the point where it is almost
impossible to really use 2.8 without COW, and keeping the old option
running ends up diverting dev resources away towards tracking down
and fixing problems with a parallel system that will be going away.
 2018-05-31 13:43:00 +02:00
Bastien Montagne
9b4e56c091 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/blenkernel/BKE_camera.h
	source/blender/blenkernel/BKE_dynamicpaint.h
	source/blender/blenkernel/BKE_object.h
	source/blender/blenkernel/intern/camera.c
	source/blender/blenkernel/intern/dynamicpaint.c
	source/blender/blenkernel/intern/object.c
	source/blender/blenkernel/intern/smoke.c
	source/blender/editors/object/object_transform.c
	source/blender/editors/physics/dynamicpaint_ops.c
	source/blender/editors/space_view3d/view3d_edit.c
	source/blender/editors/space_view3d/view3d_view.c
	source/blender/modifiers/intern/MOD_dynamicpaint.c
	source/blenderplayer/bad_level_call_stubs/stubs.c
 2018-05-31 12:57:24 +02:00
Campbell Barton
d41bf6b8e8 Edit last commit 
Better check if the property is set in case others want to use this
property w/o SKIP_SAVE set.
 2018-05-31 12:54:44 +02:00
Campbell Barton
46508430f8 Fix tool-system re-using last space type 
Even though the regression is somehow caused by 03a80facfc
this value shouldn't be reused so apply an unrelated fix.
 2018-05-31 12:51:47 +02:00
Bastien Montagne
28369f725c Cleanup: remove G.main from BKE object 
Had to add some G.main to modifiers, but in 2.8 we do not need that
anymore, so it's not that bad! ;)
 2018-05-31 12:27:47 +02:00
Sybren A. Stüvel
23e375a281 Revert "Tag COW when applying pose from pose library" 
This reverts commit 24b03729ae5ba4561ace8cbfb2d56cdbde781589; committed
too soon.
 2018-05-31 12:00:18 +02:00
Sybren A. Stüvel
24b03729ae Tag COW when applying pose from pose library 
Related to T55232
 2018-05-31 11:59:04 +02:00
Brecht Van Lommel
9948e26e14 Fix depsgrah copying and evaluating hidden collections. 2018-05-31 11:43:29 +02:00
Brecht Van Lommel
1e6108e972 OpenColorIO: cache multiple shaders instead of just one. 
Fixes constant shader and texture rebuilding when doing animation playback
with multiple editors that use different view transforms.
 2018-05-31 11:21:19 +02:00
Sergey Sharybin
46cfa605c3 Cleanup: Reduce indentation level 2018-05-31 11:17:57 +02:00
Bastien Montagne
17f458ff32 Merge branch 'master' into blender2.8 2018-05-31 11:08:02 +02:00
Bastien Montagne
24d1829243 Cleanup: nuke G.main out of BKE PackedFile code. 2018-05-31 11:07:14 +02:00
Brecht Van Lommel
fcfe1963a6 Fix depsgraph copying and evaluating hidden objects. 2018-05-31 10:37:13 +02:00
Campbell Barton
5cbad89637 Cleanup: unused defines 2018-05-31 10:15:48 +02:00
Campbell Barton
12ab59a2d6 Merge branch 'master' into blender2.8 2018-05-31 10:03:15 +02:00
Campbell Barton
84a9647f22 Cleanup: use doxy sections for space types 
Also use struct names in enum/define comments.
 2018-05-31 09:49:58 +02:00
Campbell Barton
d9324b61d5 Cleanup: return types in stubs 2018-05-31 09:49:44 +02:00
Brecht Van Lommel
e4afccf388 Depsgraph: optimization of driver evaluation with many drivers. 2018-05-31 09:46:21 +02:00
Campbell Barton
e910765ad0 WM: Use tool-system for setting brushes 
This sets the tool instead of the brush, with cycling support.
 2018-05-31 09:04:15 +02:00
Campbell Barton
81bf9a41e1 Tool System: Utility to set the tool by name 
Wrapper for the Python operator.
 2018-05-31 09:02:43 +02:00
Hristo Gueorguiev
6c0705009e Fix OpenCL compilation error - BPT without SSS. 2018-05-31 00:08:56 +02:00
Jeroen Bakker
fbd614f1fa Workbench: Highlights 
Made the highlights darker (using the defaults of blender 2.7
- sharpness = 50
- spec color = 0.025 (I bumped it to 0.1)
- added a log2 to the frontal camera light to reveal more details of the
mesh
 2018-05-30 22:19:10 +02:00
Campbell Barton
16d3f4db4c Tool System: optionally cycle tools in a group 
Add the ability for key bindings to set a tool-group,
which cycles to the next tool when the tool is already active.
 2018-05-30 22:17:37 +02:00
Campbell Barton
264a4a8f97 RNA: add tool index access 
Needed for changing the active tool from Python.
 2018-05-30 22:16:13 +02:00
Campbell Barton
84e5c981dc UI: toolbars now redraw on tool change 2018-05-30 22:16:13 +02:00
Jeroen Bakker
f5f25b843e Removed Object color from workbench. Added Highlights to FLAT shading. 2018-05-30 20:34:29 +02:00
Jeroen Bakker
eb0fcd4574 Generic Viewport Panel for Materials 
Is enabled for all render engines as workbench will be rendering
SOLID/Texture modes and uses these settings.
 2018-05-30 19:57:51 +02:00
Campbell Barton
1f693aefca Cleanup: style/whitespace 
Also use 'uint'.
 2018-05-30 19:49:33 +02:00
Campbell Barton
61fc9fcffa Cleanup: redundant check 2018-05-30 19:49:33 +02:00
Brecht Van Lommel
0b6603d9b6 Fix selection randomly failing with border render. 
We no longer user scissor for 3D viewport drawing, and some selection
code assumed it still. This also cleans up unnecessary scissor test
switching, we only have it temporarily enabled now.
 2018-05-30 19:34:12 +02:00
Ray Molenkamp
c0f42a7526 make.bat: fix support for building with just the build tools installed. 2018-05-30 11:11:35 -06:00
Brecht Van Lommel
c86437cc83 Fix Cycles UI script error with denoising. 2018-05-30 18:22:00 +02:00
Brecht Van Lommel
cce16df10f Fix Cycles viewport render stuck with curve objects. 
We should solve this better by making the depsgraph convert all curves to
meshes, for now ensure we don't to depsgraph tags during export.
 2018-05-30 18:17:49 +02:00
Brecht Van Lommel
17ce968c59 Depsgraph API: renaming, more granular update information. 
* depsgraph.ids: all evaluated datablocks in the depsgraph
* depsgraph.objects: all evaluated objects in the depsgraph
* depsgraph.object_instances: all object instances to display or render
* depsgraph.updates: list of updates to datablocks
 2018-05-30 18:17:49 +02:00
Brecht Van Lommel
08862b8246 Render API: rename some API functions back to earlier names. 
Their purpose is the same, no reason to break API compatibility here.
 2018-05-30 18:17:49 +02:00