Dalai Felinto
0d4ab09da7
Code cleanup
...
Thanks for Sergey Sharybin for spotting this.
2017-12-08 12:04:05 -02: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
Bastien Montagne
087997f9eb
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/editors/interface/interface_templates.c
2017-12-08 14:39:17 +01:00
Bastien Montagne
c7ee64b2d9
Cleanup: avoid using C++ keywords as variables, even in pure C code.
...
This tends to make some IDE unhappy (like QTCreator)...
2017-12-08 14:36:07 +01:00
Sergey Sharybin
d46305f741
Merge branch 'master' into blender2.8
2017-12-08 12:44:32 +01:00
Sergey Sharybin
2e8914549b
Cycles: Fix difference in image Clip extension method between CPU and GPU
...
Our own implementation was behaving different comparing to OSL and GPU,
namely on the border pixels OSL and CUDA was doing interpolation with
black, but we were clamping coordinate.
This partially fixes issue reported in T53452.
Similar change should also be done for 3D interpolation perhaps, but this
is to be investigated separately.
2017-12-08 12:03:11 +01:00
Clément Foucault
0467ddc674
Eevee: Fix default shader SSR id.
2017-12-08 11:58:04 +01:00
Clément Foucault
9aaf75da3d
Eevee: Fix SSR ans SSAO for intel GPU.
...
On my intel GPU there is some issue when rendering to depth only format.
This workaround the issue.
2017-12-08 11:58:04 +01:00
Clément Foucault
7f48923986
Eevee: Remove unecessary defines.
2017-12-08 11:58:04 +01:00
Sergey Sharybin
f31fb4a014
Cycles: Cleanup, split 2D interpolation function
2017-12-08 11:22:04 +01:00
Campbell Barton
82c779462d
Merge branch 'master' into blender2.8
2017-12-08 12:59:51 +11:00
Campbell Barton
4a734325f7
bl_app_override: support empty UI layout items
...
Returning None from ui_ignore functions creates empty labels,
allows removing items without breaking layout in some cases.
2017-12-08 12:57:25 +11:00
Dalai Felinto
dc848e9a8b
Merge remote-tracking branch 'origin/master' into blender2.8
2017-12-07 15:00:03 -02:00
Dalai Felinto
237df2f860
Fix Collada building
...
Bug introduced in cc811d1fd6
2017-12-07 11:51:46 -02:00
Sebastian Koenig
00067afa10
Fix T53419: Masking "Add" menu is not present in Image editor, but shortcut is
2017-12-07 14:46:07 +01:00
Sergey Sharybin
70957565dd
DPX/Cineon: Report orientation when running with --debug
2017-12-07 14:38:20 +01:00
Campbell Barton
1c0905be0f
Merge branch 'master' into blender2.8
2017-12-08 00:21:54 +11:00
Campbell Barton
efdd8f12a0
CMake: GREATER_EQUAL is from v3.7, use GREATER
2017-12-08 00:20:48 +11:00
Sergey Sharybin
bfbcc5e581
Fix T53499: Cannot load DPX files
...
The issue was caused by unspecified color transfer. New behavior gives same
result as other viewers here, so likely is fine :)
2017-12-07 14:07:57 +01:00
Sergey Sharybin
9ea7d0bf44
DPX: Fix wrong flag being checked for debug
2017-12-07 14:04:27 +01:00
Campbell Barton
1c7cfa025c
Merge branch 'master' into blender2.8
2017-12-07 23:53:03 +11:00
Campbell Barton
2e2e6e3bdb
Cleanup: Use BKE_colorband prefix
2017-12-07 15:52:59 +11:00
Campbell Barton
cc811d1fd6
Cleanup: extract BKE_colorband from BKE_texture
2017-12-07 15:40:11 +11:00
Campbell Barton
6d31eb015c
Array Modifier: option to offset UV's
...
D2912 by @Zuorion
2017-12-07 04:33:52 +11:00
Daniel Silva
2dfd795bd2
Proposed fix for T53263 -- Blender crashes when rendering with Stabilizer 2D node without movie selected
...
The program won't crash anymore, but a warning won't be displayed. Anyway, this gives the user the chance to save the project.
https://developer.blender.org/T53263
Reviewers: lukastoenne
Differential Revision: https://developer.blender.org/D2934
2017-12-06 14:54:51 +01:00
Sergey Sharybin
46f518e927
Merge branch 'master' into blender2.8
2017-12-06 14:06:49 +01:00
Sergey Sharybin
13e9291650
Library: Add flag top keep ID library pointer around
...
This only applies to ID being copied outside of bmain. Handy for cases when it
is important to check if the copy corresponds to a data block coming from
library.
Example of that is proxy evaluation with copy on write.
Thanks Bastien for review!
2017-12-06 13:00:08 +01:00
Sergey Sharybin
6c49b4154b
Merge branch 'master' into blender2.8
2017-12-06 12:27:44 +01:00
Sergey Sharybin
3ae6a8512d
Depsgraph: Cleanup, use less geenric data type
2017-12-06 12:26:10 +01:00
Sergey Sharybin
7e344a9531
Depsgraph: Proxy pose bones should be coming from CoW object
...
This should solve crash on files having proxies, but there will still be
assert failure because proxy_from is expected to come from library, which
is no longer truth for objects which got copied.
2017-12-06 12:13:10 +01:00
Sergey Sharybin
8cd4de7c25
Merge branch 'master' into blender2.8
2017-12-06 11:58:13 +01:00
Sergey Sharybin
b5be65dc0e
Depsgraph: Forgot this in previous commit
2017-12-06 11:57:57 +01:00
Sergey Sharybin
e9bbc10578
Merge branch 'master' into blender2.8
2017-12-06 11:55:30 +01:00
Sergey Sharybin
5ad3cc4e03
Depsgraph: Ignore text datablocks from nodes
...
Those are not part of dependency graph, but still could be referenced from
the tree.
2017-12-06 11:54:52 +01:00
Sergey Sharybin
674e1d4194
Depsgraph: Owner ID must always be original ID
...
Missed that in the review.
2017-12-06 11:38:58 +01:00
Sergey Sharybin
5389ca1859
Merge branch 'master' into blender2.8
2017-12-06 10:38:34 +01:00
Clément Foucault
16b9e91bf1
Eevee: Fix sampling direction calculation.
...
It was causing problems with the visibility filtering on Intel GPU.
2017-12-06 10:47:44 +01:00
Sergey Sharybin
1027ddfa2d
Depsgraph: Add missing bone properties to proxy rigs
2017-12-06 10:21:33 +01:00
Sergey Sharybin
99b9e23ce1
Depsgraph: Add missing NULL pointer check
2017-12-06 10:21:33 +01:00
Sergey Sharybin
4c5736a77f
Depsgraph: Cleanup, remove unused function
2017-12-06 10:21:33 +01:00
Sergey Sharybin
1915c30a42
Depsgraph: Remove workaround of parameters animation in node tree
2017-12-06 10:21:33 +01:00
Sergey Sharybin
630ed82ff2
Depsgraph: Remove workaround of parameters animation in lamp
2017-12-06 10:21:33 +01:00
Sergey Sharybin
8acca0e9e1
Depsgraph: Remove workaround of parameters animation in camera
...
This is something what should be done by build_animation().
2017-12-06 10:21:33 +01:00
Sergey Sharybin
21ef8e7d29
Depsgraph: Remove workaround for animated geometry component
2017-12-06 10:21:33 +01:00
Sergey Sharybin
b552e03716
Depsgraph: Remove workaround for animated modifiers
2017-12-06 10:21:33 +01:00
Sergey Sharybin
f348b7924c
Depsgraph: Leave armature animation relation to build_animation()
...
Needs some optimization trick to hook pose init function to animation
instead of a bone. This is how flush will work anyway.
2017-12-06 10:21:33 +01:00
Sergey Sharybin
cbb42fcd96
Depsgraph: Use default argument value for relations builder
...
Follows other function definitions.
2017-12-06 10:21:33 +01:00
Sergey Sharybin
18ca793ca0
Depsgraph: Cleanup, line wrapping
2017-12-06 10:21:33 +01:00
Sergey Sharybin
abc55bf84a
Depsgraph: Use build_animation() to build relations to animated properties
...
Before that it was up to lots of other places to keep track on whether
something is to be dependent on time or not. Was annoying, and unreliable,
and fragile.
This commit avoids hacks in object builder. Other areas will be adopted
soon.
2017-12-06 10:21:33 +01:00
