griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
77,270 Commits 1 Branch 0 Tags
72cfd5134be8a74b59b41574bebf3f095aa8704a
Commit Graph

77270 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sergey Sharybin
72cfd5134b Draw: Use proper continue when psys is disabled 2018-06-07 11:31:56 +02:00
Sergey Sharybin
1aa89d9a1c Particle edit: Simplify code by benefiting from single edit context 
Makes ADD brush to work.

At some point children particles draw got broken, children are not
visible for until first stroke is done. Still looking into it.
 2018-06-07 11:31:56 +02:00
Bastien Montagne
df0253be33 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/collada/ArmatureExporter.cpp
	source/blender/collada/ArmatureExporter.h
	source/blender/collada/DocumentExporter.cpp
	source/blender/collada/DocumentExporter.h
	source/blender/collada/SceneExporter.cpp
	source/blender/collada/SceneExporter.h
	source/blender/collada/collada.cpp
	source/blender/collada/collada.h
	source/blender/editors/armature/armature_edit.c
	source/blender/editors/armature/pose_transform.c
	source/blender/editors/include/ED_armature.h
	source/blender/editors/include/ED_object.h
	source/blender/editors/include/ED_screen.h
	source/blender/editors/io/io_collada.c
	source/blender/editors/object/object_transform.c
	source/blender/editors/screen/screen_edit.c
	source/blender/editors/screen/screen_ops.c
	source/blender/windowmanager/intern/wm.c
	source/blender/windowmanager/intern/wm_files.c
	source/blender/windowmanager/intern/wm_window.c
	source/blenderplayer/bad_level_call_stubs/stubs.c
 2018-06-07 11:23:26 +02:00
Bastien Montagne
54f9cd5283 Cleanup: Nuke moar G.main usages... 2018-06-07 11:11:46 +02:00
Bastien Montagne
e27759152a Minor comment on possible TODO while validating paint ops for CoW... 2018-06-07 10:59:21 +02:00
Sybren A. Stüvel
e43065596b Alembic export: CoW/Depsgraph fixes 2018-06-07 10:48:52 +02:00
Sybren A. Stüvel
d88314ee5b Alembic export: port DerivedMesh → Mesh 2018-06-07 10:48:52 +02:00
Sybren A. Stüvel
5b0f96f97c Alembic import: port DerivedMesh → Mesh 2018-06-07 10:48:52 +02:00
Jeroen Bakker
f447411a82 Bone selection: user control contrast 
Experiment: let the user be in control of the alpha channel as some rigs
are hard too see during bone selection. Especially rigs that were
designed for 2.79 wireframe mode.
 2018-06-07 09:26:06 +02:00
Jeroen Bakker
7fb216d800 Workbench: respect the duplication visibility flag 2018-06-07 09:26:06 +02:00
Campbell Barton
2d2f23de10 Fix T55348: Renaming a marker can't cancel 
Regression in a14005c070
 2018-06-07 08:54:47 +02:00
Campbell Barton
a60d4f33c6 Merge branch 'master' into blender2.8 2018-06-07 08:15:11 +02:00
Campbell Barton
409cfba1a3 Python API: Initial 'imbuf' API 
Support only basic operations new/load/write & resize.

Add now so we can extend as needed & more easily accept patches.
 2018-06-07 08:00:13 +02:00
Campbell Barton
ba80d8440f Cleanup: style 2018-06-06 22:17:06 +02:00
Campbell Barton
1c4b04f1fd Merge branch 'master' into blender2.8 2018-06-06 19:52:20 +02:00
Campbell Barton
0e68751b8a Fix BLI_ASSERT_UNIT macro w/ non-finite numbers 2018-06-06 19:49:27 +02:00
Aaron Carlisle
70b705b5fe UI: NLA: Influence should be a factor (RNA) 2018-06-06 12:09:13 -04:00
Bastien Montagne
4165a57a66 Fix broken auto-keying after copy/paste of poses. 
That bug was also likely affecting other cases - basically it was making
auto-keying always key from evaluated ('visual') values, never base,
data values... Added a flag, in some cases we do want evaluated values
here, obviously.
 2018-06-06 17:19:13 +02:00
Dalai Felinto
f818ff411a Cycles: use viewport duplicator visibility on preview 2018-06-06 16:44:51 +02:00
Dalai Felinto
04dfca5b9d Depsgraph: Expose (evaluation) mode in rna 2018-06-06 16:44:51 +02:00
Dalai Felinto
4e213d4216 Depsgraph iterator: Remove explicit mode 
We can get the mode from the depsgraph itself.
 2018-06-06 16:44:51 +02:00
Dalai Felinto
9a0506ea18 Fix T55350: Cycles: instanced hair with hidden emitter is invisible when rendering 2018-06-06 16:44:07 +02:00
Campbell Barton
36000e6da3 Cleanup: unused function 2018-06-06 16:36:00 +02:00
Campbell Barton
c44acc7fb8 Fix view_layer update function 
This was no longer working, now this works the same way as
scene.update(), only it applied to the current view layer.

Caused crash running alembic export from Python.
 2018-06-06 16:33:34 +02:00
Bastien Montagne
0ee4785675 Cleanup: get rid of just-added G.main usage. 
Was just added to ease merging of master, proper code now!
 2018-06-06 16:32:09 +02:00
Bastien Montagne
bb7202495a Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/collada/ArmatureExporter.cpp
	source/blender/collada/ArmatureExporter.h
	source/blender/collada/DocumentExporter.cpp
	source/blender/collada/DocumentExporter.h
	source/blender/collada/SceneExporter.cpp
	source/blender/collada/SceneExporter.h
	source/blender/collada/collada.cpp
	source/blender/collada/collada.h
	source/blender/editors/armature/armature_edit.c
	source/blender/editors/armature/editarmature_retarget.c
	source/blender/editors/armature/pose_transform.c
	source/blender/editors/include/ED_armature.h
	source/blender/editors/include/ED_object.h
	source/blender/editors/include/ED_screen.h
	source/blender/editors/io/io_collada.c
	source/blender/editors/object/object_transform.c
	source/blender/editors/screen/screen_edit.c
	source/blender/editors/screen/screen_ops.c
	source/blender/windowmanager/intern/wm.c
	source/blender/windowmanager/intern/wm_files.c
	source/blender/windowmanager/intern/wm_window.c
	source/blenderplayer/bad_level_call_stubs/stubs.c
 2018-06-06 16:25:28 +02:00
Jeroen Bakker
19d651ca9a View3DShading popover: Naming + alignment 2018-06-06 16:17:07 +02:00
Brecht Van Lommel
d706101559 Depsgraph: remove legacy code for dupli group updates. 
This caused crashes in some cases, and should be fully handled by
the depsgraph now.
 2018-06-06 16:00:25 +02:00
Brecht Van Lommel
bb09556be5 UI: sub panel titles draw smaller and indented. 2018-06-06 16:00:25 +02:00
Brecht Van Lommel
f55f418867 Fix incorrect double checked lock in collection object cache. 2018-06-06 16:00:25 +02:00
Sybren A. Stüvel
f884ba02a2 Merge branch 'master' into blender2.8 2018-06-06 15:58:18 +02:00
Sybren A. Stüvel
de702a4803 Alembic export: only free duplilists when not NULL 2018-06-06 15:54:03 +02:00
Bastien Montagne
48e871ab1d Cleanup: Nuke moar G.main usages... 2018-06-06 15:50:24 +02:00
Jeroen Bakker
fcf720a135 View3D: Shading Popup 
- layout so cavity options are better visible
- fixed issues showing wrong options in Material mode
- added labels + seperators
 2018-06-06 15:44:00 +02:00
Jeroen Bakker
89042f576e LookDev: When HDRI could not be reloaded we should switch to world 
Thanks for reporting sergey!
 2018-06-06 15:26:09 +02:00
Campbell Barton
7fee5f5643 Fix object-dupli selection w/ COW 2018-06-06 15:24:27 +02:00
Jeroen Bakker
f1fd5ed74f T55333 Workbench: Cavity Shader 
A cavity shader based on SSAO. Works on all workbench deferred passes.

Per 3d viewport the cavity shader options can be set as different
shading needed different options. Some global options are in the
Viewport Display of the scene like num samples and distance.

Experimental: Naming of Ridges and Valleys
 2018-06-06 14:51:18 +02:00
Sybren A. Stüvel
4a52531a11 Alembic: Fix double-free of mutex 
The mutex was shared between CoW copies of the CacheFile datablock, and
as a result also freed multiple times. It is now only freed when the
original datablock is freed; the CoW copies share the same mutex.
 2018-06-06 14:38:17 +02:00
Sybren A. Stüvel
4c4fa3d49b Fix double-free of custom data 
This causes a temporary spike in memory usage when creating a copy; the
entire copy will be removed anyway when DerivedMesh is removed.
 2018-06-06 14:38:17 +02:00
Pablo Vazquez
3b8ae85e3d Move Time Remapping into a sub-panel 2018-06-06 14:28:35 +02:00
Sergey Sharybin
a8ae68aa5c Fix crash when file is saved in particle edit mode 
Depsgraph is not available on file load yet.
 2018-06-06 14:13:46 +02:00
Campbell Barton
2088bb0d49 UI: add particle brush to topbar 2018-06-06 14:06:45 +02:00
Sergey Sharybin
b58e5d4f2c Particle edit: Fix missing hair with new oarticle system added 2018-06-06 13:54:39 +02:00
Sergey Sharybin
1295e85de0 Particle edit: Fix crash when trying to edit particles without cache 
Particles in EMITTER mode needs to have cache.
 2018-06-06 13:54:39 +02:00
Bastien Montagne
528cdf9b50 Fix update issue in VPaint mode. 
Need to flush the changes through DEG CoW, otherwise drawing code would
not see them in some cases...
 2018-06-06 12:42:01 +02:00
Sergey Sharybin
e3324c3a8e Depsgraph: Silence relations builder errors 
Were caused by depsgraph trying to create relations between objects
which are coming from restricted collection.
 2018-06-06 12:36:52 +02:00
Sergey Sharybin
22370929fe Depsgraph: Expand object data datablocks for drivers 
Drivers can reference object data datablock directly, and if there
was no object in the scene with that datablock, blender will crash.
 2018-06-06 12:36:52 +02:00
Sergey Sharybin
7810c60fe3 Depsgraph: Handle key->object relations from object builder 2018-06-06 12:36:51 +02:00
Sergey Sharybin
695747aad1 Depsgraph: Object data separation, armature 2018-06-06 12:36:51 +02:00
Sergey Sharybin
5a14af62d0 Depsgraph: Object data separation, geometry 2018-06-06 12:36:51 +02:00