Blender Git "temp-greasepencil-vfx" branch commits. Page: 18 / 145 June 5, 2018, 15:04 (GMT) | Merge branch 'blender2.8' into greasepencil-object
Conflicts:
release/scripts/startup/bl_ui/properties_grease_pencil_common.py
release/scripts/startup/bl_ui/space_view3d.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py
| June 5, 2018, 12:01 (GMT) | Merge branch 'blender2.8' into greasepencil-object
| June 4, 2018, 18:12 (GMT) | Update submodule references
This change has been created by merge, but really does not change anything.
| June 4, 2018, 18:11 (GMT) | Disable all modes after convert file
| June 4, 2018, 18:08 (GMT) | Disable missing flag
The WEIGHT flag must be disable too.
| June 4, 2018, 17:35 (GMT) | Merge branch 'blender2.8' into greasepencil-object
| June 4, 2018, 15:25 (GMT) | Fix rename missing in previous commit
These fields were not renamed in previous commit.
| June 4, 2018, 15:07 (GMT) | Remove deprecated data and move to new file conversion tools
These tools are included inside a file with DNA_DEPRECATED_ALLOW
| June 4, 2018, 13:34 (GMT) | Merge branch 'blender2.8' into greasepencil-object
| June 4, 2018, 09:28 (GMT) | Merge branch '28' into greasepencil-object
| June 4, 2018, 09:26 (GMT) | Merge branch '28' into greasepencil-object
| June 4, 2018, 07:06 (GMT) | Merge branch 'blender2.8' into greasepencil-object
| June 3, 2018, 14:20 (GMT) | Merge branch 'blender2.8' into greasepencil-object
| June 3, 2018, 07:41 (GMT) | Merge branch 'blender2.8' into greasepencil-object
| June 1, 2018, 17:38 (GMT) | Merge branch 'blender2.8' into greasepencil-object
Conflicts:
source/blender/blenkernel/intern/object.c
| June 1, 2018, 13:35 (GMT) | Remap mode keymaps and solve merge issue
The keymap has been changed and there was a merge error.
| June 1, 2018, 13:20 (GMT) | Merge branch 'blender2.8' into greasepencil-object
| June 1, 2018, 11:21 (GMT) | Merge branch 'blender2.8' into greasepencil-object
Conflicts:
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/makesrna/intern/rna_material.c
| June 1, 2018, 08:02 (GMT) | More fixes after merge
| June 1, 2018, 07:19 (GMT) | Fix parameter values after merge
This python function needs different settings after merge.
|
|
|
Master Commits
MiikaHweb | 2003-2021