October 7, 2016, 13:44 (GMT) |
Merge branch 'blender2.8' into custom-manipulators Conflicts: source/blender/editors/space_view3d/view3d_draw.c |
October 7, 2016, 13:35 (GMT) |
Merge branch 'master' into temp-sybren-poselib |
October 7, 2016, 13:15 (GMT) |
Merge branch 'blender2.8' into temp_manipulators_core |
October 7, 2016, 13:14 (GMT) |
Merge branch 'master' into blender2.8 |
October 7, 2016, 11:33 (GMT) |
Proxied ? Proxified |
October 7, 2016, 11:08 (GMT) |
Re-establish link to proxies when they are made local after appending. This allows appending of an entire scene from another blend file into this one, even when that blend file contains proxified armatures. Since the proxified object needs to be linked (not local), this will only work when the "Localize all" checkbox is disabled. The appended proxy object should also not be referenced from anything in a library (for example in a constraint). Referencing it from the appended data should be fine. Fixes T49495. |
October 7, 2016, 10:02 (GMT) |
Merge branch 'master' into asset-engine |
October 7, 2016, 09:50 (GMT) |
Merge branch 'master' into blender2.8 |
October 7, 2016, 08:20 (GMT) |
Datablock management: remove 'proxy_from' pointer from 'is ID used' checks. Pretty much same reason as for the 'from' pointer of shapekeys - runtime data creating loops and 'ghost' dependencies between datablocks. We need to handle them in cases like remapping, but whall not take them into account to check dependencies between datablocks... :/ |
October 7, 2016, 08:19 (GMT) |
Fix T49595: bpy - negative skin_vertices radius crashes Blender This is unsigned value (negative radius does not have much sense anyway!). |
October 7, 2016, 07:17 (GMT) |
October 7, 2016, 07:04 (GMT) |
October 7, 2016, 04:56 (GMT) |
October 7, 2016, 04:06 (GMT) |
October 7, 2016, 04:00 (GMT) |
OpenGL: fix shader input typo |
October 7, 2016, 02:05 (GMT) |
gpencil: disable / remove some legacy drawing Want to avoid updating code we no longer use anyway. Comments for areas to investigate or deadlines for deletion. also some minor bool cleanup Part of T49165 |
October 7, 2016, 01:56 (GMT) |
Avoid possible compatibility issues with tmp viewport flags We can't prevent users from using this branch, so I'd say it's reasonable to be a bit careful about what we store to files. In this concrete case we were storing a bit-flag for temporary use (only during early viewport transition) in a bit-field that's saved in files. Doing so would mean we either can't reuse this bit later or we risk breaking files (admittedly, likely in a pretty minor way). Moved the bit-flag to a new bit-field which can be removed later. |
October 7, 2016, 01:47 (GMT) |
Viewport: support for external render engines (e.g., Cycles) with depth (it is still a rough approach, but you can already see Cycles with Floor (when using board render or full render) |
October 7, 2016, 01:47 (GMT) |
Viewport: floor cleanup |
October 7, 2016, 01:47 (GMT) |
Viewport: draw floor routine should not use GL_ALWAYS for depth (talked with merwin about that, and he agrees on it, we are not supposed to write to the scene depth buffer but we should read its depth) |
|
|
|


Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021