Blender Git Loki

Blender Git "temp-greasepencil-object-stacksplit" branch commits.

Page: 29 / 137

April 19, 2018, 15:13 (GMT)
Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/blenloader/intern/versioning_280.c
source/blender/editors/space_view3d/view3d_header.c
April 19, 2018, 15:02 (GMT)
Fix missing library Palette relink

The palette pointer was not relink as expected for Brushes and GP strokes.
April 18, 2018, 14:33 (GMT)
Merge branch 'blender2.8' into greasepencil-object
April 18, 2018, 08:57 (GMT)
Fix various compiler warnings/errors
April 18, 2018, 08:52 (GMT)
Merge branch 'blender2.8' into greasepencil-object

# Conflicts:
# source/blender/blenloader/intern/versioning_280.c
# source/blender/makesrna/intern/rna_scene.c
April 17, 2018, 16:37 (GMT)
Cleanup: Whitespace + Code Redundancy
April 17, 2018, 16:28 (GMT)
Merge branch 'blender2.8' into greasepencil-object

Tempting fate by merging in the Game Engine removal in here too...
We might as well do this now though, since it'll have to happen at
some time anyway!

# Conflicts:
# release/scripts/startup/bl_ui/properties_scene.py
# source/blender/blenkernel/intern/object.c
# source/blender/blenloader/intern/versioning_280.c
# source/blender/gpu/CMakeLists.txt
# source/blenderplayer/bad_level_call_stubs/stubs.c
April 17, 2018, 16:16 (GMT)
Fix: Putting back bakeModifierGP() for Lattice and Hook

Ideally, we'd run this on a depsgraph-copy, on a background thread. But, that's
that's something that we'd be passing through to the modifier bake callbacks.
April 17, 2018, 15:04 (GMT)
MOAR compile fixes for GP branch after merge

Lots more fixes for various little things that broke after the merge and the
fixes required for that.

Unfortunately, I've had to disable a few things to get Blender compiling
again - those will require a bit more attention to fix.

Things currently broken/disabled:
* Apply/Bake for Hook and Lattice modifiers - disabled as we need to rethink how
this works after EvaluationContext removal. Probably should go to a new depsgraph
copy (instead of working in main depsgraph).

* Helplines for GP point edit - 1c9690e7607bc990cc4a3e6ba839949bb83a78af has been
temporarily reverted due to conflicts with multiedit changes
April 17, 2018, 14:05 (GMT)
Merge branch 'blender2.8' into greasepencil-object

Note:
There were some additional changes needed due to the EvaluationContext -> Depsgraph
cleanups + MultiObject edit that happened in 2.8 since the last merge of 2.8 into
this branch.


# Conflicts:
# release/datafiles/locale
# release/scripts/addons
# release/scripts/addons_contrib
# source/blender/blenkernel/BKE_modifier.h
# source/blender/editors/gpencil/gpencil_paint.c
# source/blender/editors/include/ED_object.h
# source/blender/editors/object/object_modifier.c
# source/blender/editors/screen/screen_context.c
# source/blender/editors/space_view3d/view3d_draw_legacy.c
# source/blender/editors/transform/transform.c
# source/blender/editors/transform/transform_conversions.c
# source/blender/editors/transform/transform_generics.c
# source/blender/editors/undo/ed_undo.c
# source/tools
April 17, 2018, 10:57 (GMT)
Cleanup: Various code/style tweaks to GP code
April 17, 2018, 10:20 (GMT)
Compiler warning fixes on GCC

* gpencil_add_*_shgroup() - Removed unused parameters (gpd)

* Fix warning about rgba being uninitialised in gpencil_fill.c::get_pixel()
- The non-float case here looks like it shouldn't ever happen, but for good measure,
I've added an assert + set a value here to keep compiler happy.

* Fix uninitialised var in gp_brush_drawcursor() - paintbrush

* GPencilOffsetModifier defined an RNA vertex group name set function, but didn't use it
April 16, 2018, 19:20 (GMT)
Cleanup: various warnings

Now compiles w/o warnings for GCC
April 16, 2018, 19:08 (GMT)
Fix invalid brush assignments
April 16, 2018, 19:07 (GMT)
Cleanup: unused variables & args
April 16, 2018, 18:52 (GMT)
Cleanup: -Wparentheses & line length
April 16, 2018, 17:01 (GMT)
UI Tweak: Rename "Grease Pencil" menu in 3D View to "Strokes"

Menu names in general should be a single word. Having two separate words makes it
visually confusing (i.e. it looked like there were 4 menu items, when in fact there
were only 3). Since the operators here operate on the GP strokes, it's reasonable
to use this term instead.

(Discussed with William as part of an informal UI review of GP branch)
April 16, 2018, 16:57 (GMT)
Fix compile error: Was missing 'const' qualifier
April 16, 2018, 07:58 (GMT)
Merge branch 'blender2.8' into greasepencil-object
April 15, 2018, 14:18 (GMT)
Merge branch 'blender2.8' into greasepencil-object
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021