griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
77,658 Commits 1 Branch 0 Tags
3a36cbdfde85aa4461e6907d49e3afa45ac2dfbb
Commit Graph

77658 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Campbell Barton
3a36cbdfde Transform: Suppress assert w/ vertex paint 2018-06-14 16:14:51 +02:00
Sergey Sharybin
00eeb05f4c Depsgraph: Make certain components NOT tag copy-on-write when they are tagged 
Currently done for mesh batch cache update, and for base flags sync.
Those components do not need anything from original object, and hence
can skip CoW tag and have faster update after them used.
 2018-06-14 16:04:09 +02:00
Sergey Sharybin
42d8872014 Depsgraph: Use dedicated ocmponent for object's base flags flush 2018-06-14 16:04:09 +02:00
Bastien Montagne
87b2444270 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/collada/AnimationExporter.cpp
	source/blender/collada/AnimationExporter.h
	source/blender/collada/ArmatureImporter.cpp
	source/blender/collada/ArmatureImporter.h
	source/blender/collada/ControllerExporter.cpp
	source/blender/collada/ControllerExporter.h
	source/blender/collada/DocumentExporter.cpp
	source/blender/collada/DocumentImporter.cpp
	source/blender/collada/GeometryExporter.cpp
	source/blender/collada/GeometryExporter.h
	source/blender/collada/MeshImporter.cpp
	source/blender/collada/MeshImporter.h
	source/blender/collada/SkinInfo.cpp
	source/blender/collada/SkinInfo.h
	source/blender/collada/collada_utils.cpp
	source/blender/collada/collada_utils.h
 2018-06-14 15:55:51 +02:00
Brecht Van Lommel
0626de2033 GPU: consistenly use mipmap on/off in all draw modes. 
This is important for good texture paint performance.
 2018-06-14 15:50:22 +02:00
Brecht Van Lommel
14db989e73 Cleanup: remove legacy GPU pass binding code. 2018-06-14 15:46:43 +02:00
Jeroen Bakker
39142103d9 T55479: Tag for update when active texture changes 2018-06-14 15:30:06 +02:00
Bastien Montagne
fd19069999 Cleanup: remove last G.main's from Collada code. 2018-06-14 15:15:51 +02:00
Jeroen Bakker
277d901274 T55456 EditMeshMode 
- see the face selection color when face is active
- test different masks for active face, finally chosen for no mask at
all.
 2018-06-14 14:18:52 +02:00
Sybren A. Stüvel
158930228d Improved two tooltips 
Tooltips shouldn't just repeat the information from the label.
 2018-06-14 13:55:24 +02:00
Brecht Van Lommel
f4dc4bd275 Fix crash on startup in after recent G.main changes. 2018-06-14 13:45:15 +02:00
Bastien Montagne
3eba5c0079 Cleanup: remove last G.main's in WM code of 2.8. 
Again, just validating ther usage and using G_MAIN instead.
 2018-06-14 12:42:30 +02:00
Bastien Montagne
4bf751be70 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/modifiers/intern/MOD_normal_edit.c
	source/blender/windowmanager/intern/wm_files.c
 2018-06-14 12:39:52 +02:00
Bastien Montagne
66407e15cb Cleanup: Remove last G.main's from WM code. 
Was mostly validating valid usages of G.main -> G_MAIN actually.
 2018-06-14 12:34:13 +02:00
Jeroen Bakker
a671aa922a Workbench: Material colors + settings during sculpting 2018-06-14 12:12:27 +02:00
Clément Foucault
d64cd6f7ee Move call to drw_state_ensure_not_reused() inside the region locked by DST.gl_context_mutex. 
Currently with a debug build there is a race condition where the mutex is released before the DST structure is reset to 0xFF, meaning when multiple threads are using the DRWManager it can get cleared when the main thread is using it, causing crashes.

Reviewers: fclem, brecht

Reviewed By: fclem

Tags: #bf_blender_2.8

Differential Revision: https://developer.blender.org/D3476
 2018-06-14 12:03:40 +02:00
Jeroen Bakker
17b029d80e T55406: Flip Matcap 
- Icon represent the flipped matcap in the shading menu
- Added template_icon to display any icon in scale.
 2018-06-14 11:44:36 +02:00
Bastien Montagne
0eb3246713 Fix T55470: Add option to not fix polygons' winding to Edit Normals modifier. 
this is actually adding option to add buggy behavior, but.. NPR often
expects buggy behaviors, and its one of the main targets for normal editing.
So think it's reasonable to add that option (disabled by default of
course).

Note that am not really happy with UI, but:
* Not sure where to put it, it's kind of own self-contained area option.
* Don't to make it too much visible, using this should be the exception!
 2018-06-14 11:41:12 +02:00
Campbell Barton
fecec7dd68 3D View: Show view-aligned rotation manipulators 2018-06-14 11:37:47 +02:00
Campbell Barton
f35572ae9e Cleanup: style 2018-06-14 11:37:47 +02:00
Clément Foucault
62f594ca7b UI: Make spacers align blocks on area divisions 
This solves the problem of blocks jumping around when changing modes and
center them to the area (in case of only 2 spacers).
Which is (in my own opinion) more aestetically pleasing.
 2018-06-14 11:29:44 +02:00
Campbell Barton
7449dc8d13 3D View: Tweak transform plane manipulator fading 
The threshold to fade out and hide was too small.
 2018-06-14 10:39:36 +02:00
Campbell Barton
4ee97c9a1c WM: increase hot-spot of 3D manipulators 
Larger hot-spot was disabled for performance,
however without this - clicking on them is too difficult.
 2018-06-14 09:55:58 +02:00
Campbell Barton
ba2c10c1f7 3D View: increase size of view aligned rotation 
Minor changes based on user feedback.

- View aligned rotation manipulator overlapped too often
  with axis aligned widgets. Increase size (matching 2.79)
- Offset arrow-heads when combining rotate & translate,
  don't draw the stem since it overlaps with scale.
 2018-06-14 09:46:11 +02:00
Campbell Barton
22ac20a705 WM: option not to draw arrow manipulator stem 2018-06-14 09:25:55 +02:00
Campbell Barton
eeca206e76 Cleanup: rename arrow manipulator 'draw_options' 
Rename to 'transform' since this controls interaction.
 2018-06-14 09:17:03 +02:00
Campbell Barton
b839d67f3e UI: correct HUD zoom resetting 2018-06-14 08:30:46 +02:00
Clément Foucault
2f3e890b94 DRW: Fix crash caused by hair transform feedback 
Seem to be cause by the lack of proper FBO bound.
 2018-06-13 22:20:48 +02:00
Campbell Barton
8d2309f94f 3D View: make navigation buttons smaller 
Keep orbit large, other buttons are now closer to other icons buttons.
 2018-06-13 21:00:05 +02:00
Brecht Van Lommel
711a50c5ea Merge branch 'master' into blender2.8 
This includes making Eevee match Cycles behavior of inserting an emission
node when linking colors to closures.
 2018-06-13 19:26:52 +02:00
Brecht Van Lommel
4d58fac1b4 Fix undo group to use human readable name, since this shows in the UI. 2018-06-13 18:39:30 +02:00
Brecht Van Lommel
3102833962 Fix undo of transform after frame change undoing too much. 
For grouped undo we should not skip the undo push, rather replace the
previous undo push. This way undo goes back to the state after the last
operation in the group.
 2018-06-13 18:39:30 +02:00
Brecht Van Lommel
90e6323ed8 Cycles: auto insert emission node when linking color to closure. 
This is convenient for previewing the output of a node, and we agreed
to support this behavior in both Eevee and Cycles.
 2018-06-13 18:39:30 +02:00
Campbell Barton
a3c630aebb Merge branch 'master' into blender2.8 2018-06-13 18:25:23 +02:00
Campbell Barton
57cd52a4ab WM: check release event for particle edit mode 
Caused by drag event.
 2018-06-13 18:23:09 +02:00
Jeroen Bakker
2e23385c35 T55456: EditDrawMode 
reorganized shader compilation
 2018-06-13 16:47:38 +02:00
Jeroen Bakker
645c918825 T55456: EditDrawMode 
use darker defaults for not active selection mode elements
 2018-06-13 16:47:38 +02:00
Bastien Montagne
4943739b89 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/blenloader/intern/readfile.c
	source/blender/editors/mesh/editmesh_utils.c
	source/blenderplayer/bad_level_call_stubs/stubs.c
 2018-06-13 16:42:56 +02:00
Jeroen Bakker
b8015ece51 Revert "T55456: EditDrawMode" 
This reverts commit da6ed54569.
 2018-06-13 16:34:20 +02:00
Bastien Montagne
f61c30f804 Cleanup: get rid of last G.main in BMesh code. 2018-06-13 16:29:12 +02:00
Campbell Barton
cd0a4836d4 Cleanup: unused var 2018-06-13 16:17:07 +02:00
Sergey Sharybin
9c65227061 Tag object/scene for selection update from operators 
Before that depsgraph tagging was done from inside notifier listener in
viewport. This had the following issues:

- If there are no viewports, selection tag was not done. Causing possible
  issues when object becomes visible.

- Required special trickery to detect which data to tag for update.

- Was causing crash when transforming/selecting markers in clip editor.
  This is because selecting marker needed to poke viewport to redraw, since
  selected bundles will be displayed differently in viewport.
 2018-06-13 16:07:55 +02:00
Dalai Felinto
c1e503e89a Silence false positive warning on boolean modifier 2018-06-13 16:04:31 +02:00
Bastien Montagne
1bcf9217eb Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/blenkernel/BKE_pointcache.h
	source/blender/blenkernel/intern/object.c
	source/blender/blenkernel/intern/pointcache.c
	source/blender/editors/include/ED_particle.h
	source/blender/editors/physics/particle_edit.c
	source/blender/editors/physics/particle_edit_undo.c
	source/blender/editors/physics/particle_object.c
	source/blender/editors/physics/physics_intern.h
	source/blender/editors/physics/physics_pointcache.c
	source/blender/editors/space_time/space_time.c
	source/blender/editors/space_view3d/drawobject.c
	source/blender/editors/space_view3d/view3d_edit.c
	source/blender/editors/transform/transform_conversions.c
	source/blender/editors/transform/transform_generics.c
	source/blender/editors/transform/transform_manipulator.c
	source/blender/makesrna/intern/rna_object.c
	source/blender/makesrna/intern/rna_object_force.c
	source/blender/makesrna/intern/rna_sculpt_paint.c
	source/blenderplayer/bad_level_call_stubs/stubs.c
 2018-06-13 15:36:24 +02:00
Brecht Van Lommel
7a10cfe7fe UI: preset popover buttons in panel headers. 
Moves the preset into a menu for the panel header, so it can be changed
without opening the panel and takes up less space. Two remaining issues:

* For long lists the add new preset button can be scrolled off screen.
* We should support showing the name of the chosen preset in the panel
  header, but the current preset system does not support detecting which
  preset is used.

Differential Revision: https://developer.blender.org/D3366
 2018-06-13 15:22:34 +02:00
Dalai Felinto
1664ccb675 Fix flexible spacer distance 
Introduced on 0bce173bc7.
 2018-06-13 15:17:56 +02:00
Dalai Felinto
8f8205584d UI: Make NLA header consistent with dopesheet 2018-06-13 15:07:25 +02:00
Campbell Barton
1a6b2650fa Cleanup: double quotes for non-enum strings 2018-06-13 15:06:58 +02:00
Campbell Barton
eed9458c22 UI: center align 3D view header snap, pivot etc 2018-06-13 15:04:13 +02:00
Dalai Felinto
6b6c86d1f7 UI: Fix clip editor double text-less icon situation 2018-06-13 15:04:07 +02:00