griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
73,827 Commits 1 Branch 0 Tags
17577c53c672dcc8d5493324c4bcb970db455f2a
Commit Graph

4069 Commits

Author SHA1 Message Date
Campbell Barton
17577c53c6 Merge branch 'master' into blender2.8 2018-02-07 11:19:01 +11:00
Campbell Barton
1e4b612d6a Cleanup: add _types.h suffix to DNA headers 2018-02-07 11:14:08 +11:00
Campbell Barton
5ec016169b Object Mode: use eval_ctx for context/screen code 2018-02-06 18:03:28 +11:00
Campbell Barton
c7fecab2ef Object Mode: Use eval_ctx mode for drawing, paint & modifiers 2018-02-06 18:03:28 +11:00
Campbell Barton
c3eb22e2ab Merge branch 'master' into blender2.8 2018-02-02 14:15:29 +11:00
Sergey Sharybin
7884ae6eb2 Fix T53686: VSE Render crash when zooming timeline 
This is rather a workaround to avoid main thread freeing all glyph caches
at the same time as sequencer uses fonts to draw text sequences.

Ideally we need to either make cache more local, or user-counted or to make
somewhat more global locks. All this ends up in a bigger refactor which is
better for 2.8. For the meantime let's make Blender more stable with a tiny
workaround.

Downside is that keeping zooming things up and down in interface during render
will increase memory usage by unused glyph caches. It's not too bad though,
all unused caches will be freed first time at area zoom after render.

Thanks Bastien for review!
 2018-02-01 16:34:30 +01:00
Campbell Barton
807713e4f2 UI: re-enable alt-key for editing selection 
Fixes T53950 where changing node layers applies to all selected nodes.
 2018-01-31 11:54:04 +11:00
Campbell Barton
5836293990 Merge branch 'master' into blender2.8 2018-01-25 22:20:27 +11:00
Campbell Barton
7d66925c73 WM: NULL check for recent tooltip change 
Caused crash dragging boolean buttons.
 2018-01-25 21:52:40 +11:00
Campbell Barton
38dafd5f44 Merge branch 'master' into blender2.8 2018-01-25 16:32:43 +11:00
Campbell Barton
693b41eb17 UI: change tool-tips to be stored in the screen 
Move timer and tip out of button code,
now the only requests a tooltip,
passing a creation callback to run.

Needed for manipulators in 2.8,
also helps de-duplicate logic - since we never want
multiple tool-tips showing at once.
 2018-01-25 16:22:21 +11:00
Campbell Barton
f7c812e199 Merge branch 'master' into blender2.8 2018-01-22 14:14:33 +11:00
Campbell Barton
c723e91ee1 WM: add mouse-move after smooth-view 
When hot-spots moved under the pointer,
clicking wouldn't activate the correct item.
 2018-01-22 14:09:17 +11:00
Germano
790025c01e Merge branch 'master' into blender2.8 
# Conflicts:
#	intern/cycles/blender/blender_mesh.cpp
#	source/blender/editors/screen/screen_ops.c
#	source/blender/editors/space_view3d/drawobject.c
 2018-01-21 18:45:47 -02:00
Campbell Barton
a7dc5e12ac Cleanup: style 2018-01-21 11:41:52 +11:00
Bastien Montagne
72ec6dbb0b Static overrides API: add functions to create overrides from several datablocks at once. 
This simplifies remapping task, since you don't have to ensure your
overrides are created in the correct dependency order.

Uses famous LIB_TAG_DOIT to mark IDs to be overridden.
 2018-01-16 17:11:03 +01:00
Campbell Barton
873a87c7e8 Merge branch 'master' into blender2.8 2018-01-16 14:56:03 +11:00
Campbell Barton
e428ea3e00 Cleanup: indentation 2018-01-16 11:40:43 +11:00
Campbell Barton
6f45dea6ee UI: support canceling color ramp drag 
D2997 by @oktomus
 2018-01-16 11:16:50 +11:00
Brecht Van Lommel
cdc31c3e6e Merge branch 'master' into blender2.8 2018-01-13 02:05:49 +01:00
Campbell Barton
ff4c9d69ee User Prefs: add new flag for app-template options 
For experimental options, outside the scope of typical preferences.

While templates are developed we might want to make changes
to behavior which aren't fully compatible with typical work-flows.

Instead of mixing these options in with current preferences
expose separately (we could even force disable them when templates
aren't int use)
 2018-01-12 12:45:56 +11:00
Bastien Montagne
c36f4a7f7f Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/blenkernel/intern/blender.c
	source/blender/makesdna/DNA_ID.h
 2018-01-11 14:35:36 +01:00
Campbell Barton
717090f40e UI: option not to show screen splitting widgets 
Request for simplified Blender template,
this may be extended to limit access to other UI changes
that could be pressed by accident.
 2018-01-11 16:10:46 +11:00
Campbell Barton
9c91c75ea6 Merge branch 'master' into blender2.8 2018-01-11 13:24:41 +11:00
Campbell Barton
9d62e6e782 UI: don't draw outline when it's not calculated 
Outline drawing was running even when there were no verts to draw.
Causes an assert in 2.8.
 2018-01-11 13:23:55 +11:00
Campbell Barton
f20bb6c63f Merge branch 'master' into blender2.8 2018-01-04 00:09:10 +11:00
Campbell Barton
be40389165 Merge branch 'master' into blender2.8 2018-01-03 23:44:47 +11:00
Campbell Barton
2f8c2572ed Fix T53632: Objects outside scene shown in popup 
Only show objects in current scene when not pinned.

This commit adds a filter argument to id-template
since we may want to filter by other criteria.
 2018-01-03 21:54:02 +11:00
Bastien Montagne
17f1ce4d4f Fix T53630: Effect strips not displaying Input data. 
Fix T52977: Parent bone name disappeared in the UI in pose mode.

Regression caused by own rBc57636f060018. So instead of changing widget
type, just flag it as disabled.

Note that core of the issue is elsewhere though - there is absolutely no
reasons to have a search widget for pointers we cannot change nor
search! But fixing this is not really top priority, one of the many
glitches of our UI code, so think we can live with current code.

To be backported to 2.79a.
 2017-12-28 17:57:18 +01:00
Sergey Sharybin
9eb46fc22b Fix compilaiton error in debug mode 
The structure was just calloc-ed, no need to check for anything. It's all zeroes!
 2017-12-20 16:41:51 +01:00
Sergey Sharybin
a52452c043 Merge branch 'master' into blender2.8 2017-12-20 16:40:49 +01:00
Campbell Barton
d0ac5d3810 Cleanup: remove unnecessary tooltip line limit 
Also add TODO for possible future changes.
 2017-12-20 17:20:33 +11:00
Campbell Barton
5b364dd780 Manipulator: tooltip support 
Currently operators and properties are used.
 2017-12-20 16:40:53 +11:00
Campbell Barton
3143b2f942 Merge branch 'master' into blender2.8 2017-12-20 15:06:22 +11:00
Campbell Barton
51f0c3fadf UI: move tooltip API to public header 2017-12-20 14:58:06 +11:00
Campbell Barton
9d69b3d48b Merge branch 'master' into blender2.8 2017-12-19 19:42:11 +11:00
Campbell Barton
77c62c7793 UI: split out button checks from tooltip creation 
Allows to make tooltips from other kinds of data.
 2017-12-19 19:34:16 +11:00
Bastien Montagne
5566a88873 Static Override: better handling in ID template. 
Now we stick to a single button, when data is directly linked, clicking
on it will make a local copy, while shift-clicking on it will make a
static override.

When data is a static override, icon is the DATA_OVERRIDE one, and clicking
on the button will make it a fully borring local data-block.
 2017-12-18 12:29:08 +01:00
Campbell Barton
b83b6afe55 Merge branch 'master' into blender2.8 2017-12-14 12:51:26 +11:00
Ray Molenkamp
a621850224 Fix T53550: E hotkey not working after the color-band picker commit 
Related to D2886, the color-band picker was lacking a poll function.
 2017-12-13 07:00:16 -07:00
Sergey Sharybin
3d6cc77cbd Merge branch 'master' into blender2.8 2017-12-13 14:24:44 +01:00
Campbell Barton
611752ce33 UI: color-band eyedropper now combines samples 
Resulting color-band was too noisy (especially with photos),
use gauss filter to take surrounding samples into account.
 2017-12-13 15:38:11 +11:00
Campbell Barton
56f00db6c9 Correct error in recent merge 2017-12-12 23:19:41 +11:00
Campbell Barton
edd39f6da7 Merge branch 'master' into blender2.8 2017-12-12 16:13:06 +11:00
Campbell Barton
b3c147a04f Cleanup: split eyedropper into separate files 
Each handles separate data-types and didn't share much logic,
better put each in it's own file.
 2017-12-12 15:44:59 +11:00
Campbell Barton
41fc0a0624 Merge branch 'master' into blender2.8 2017-12-12 13:55:09 +11:00
Ray Molenkamp
7ae4c3a019 Add eyedropper to color-ramp widget 
D2886 by @LazyDodo with edit's by @campbellbarton

The line drawn with the eyedropper is used to fill the color-ramp.
 2017-12-12 13:11:38 +11:00
Bastien Montagne
48fe46943e Add a new button in ID template to generate an override, and new icon placeholder. 
Note that due to mess with inkscape (see T53516), I cannot generate a new icon
currently. :(

Commit related to T53501.
 2017-12-11 12:07:13 +01:00
Bastien Montagne
6e85c59250 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/interface/interface_templates.c
 2017-12-08 14:54:59 +01:00
Bastien Montagne
f39a97fac5 Cleanup: moar busting of nasty C++ keywords-as-varnames. 2017-12-08 14:50:45 +01:00