Blender Git Loki

Blender Git commits from all branches.

Page: 1549 / 2888

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, 12:55 (GMT)
immediately take constraint limit changes into account during rigidbody simulation
Revision 28dd3da by Gaia Clary
April 17, 2018, 12:10 (GMT)
Refactor: Moved unrelated class methods to collada_utils
Revision e441aaa by Gaia Clary
April 17, 2018, 11:35 (GMT)
Refactor: Renamed classes, updated comments for better reading
Revision d16e735 by Gaia Clary
April 17, 2018, 11:15 (GMT)
Cleanup collada: improved class description comment
Revision 01a9d37 by Gaia Clary
April 17, 2018, 11:03 (GMT)
Refactor Collada: Moved static class functions to collada_utils

Reason: The functions had nothing to do with the class
April 17, 2018, 10:57 (GMT)
Cleanup: Various code/style tweaks to GP code
Revision 5712653 by Gaia Clary
April 17, 2018, 10:35 (GMT)
Merge branch 'master' into collada
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
Revision be77437 by Gaia Clary
April 17, 2018, 09:14 (GMT)
Merge remote-tracking branch 'origin/master' into collada-new
Revision 456e0b8 by Gaia Clary
April 17, 2018, 08:59 (GMT)
Cleanup Collada: moved typedefs to more intuitive locations
Revision d316e46 by Gaia Clary
April 17, 2018, 08:59 (GMT)
cleanup: indentation and class method declarations
Revision 4a045e6 by Gaia Clary
April 17, 2018, 08:59 (GMT)
Refactor Collada: Major rewrite of the AnimationExporter

* Mostly reorganized the classes and made them more readable.
* The animation sampler now can be used for any animation curve.
Before the sampler only looked at curves which are supported by
Standard Collada 1.4. However the Collada exporter currently
ignores all animation curves which are not covered by the 1.4.1
Collada Standards. There is still some room for improvements
here (work in progres)
* Removed some unnecessary dependencies and cleaned up many
functions which have become unnecessary and no longer used.
* moved functions between classes to better match the class
responsibilities.
* took care that the functions are kept small and understandable
* removed intermediate structures which are no longer needed
* cleanly separated the Animation sample part from the
Collada part so that they can be treated independently from each
other

Known issues:

* Some exports do currently not work reliably, among those
are the camera animations, material animations and light animations
those animations will be added back next (work in progres)

* Exporting animation curves with keyframes (and tangents)
sometimes results in odd curves (when parent inverse matrix is involved)
This needs to be checked in more depth.

* Export of "all animations in scene" is disabled because the
Collada Importer can not handle this reliably at the
moment (work in progres).
Revision a28de91 by Gaia Clary
April 17, 2018, 08:59 (GMT)
Fix Collada: replaced nullptr by NULL at various places

To remain compatible with the c++ version used in master
Revision 903466d by Gaia Clary
April 17, 2018, 08:59 (GMT)
Cleanup Collada: Renamed Enum entries for consistency

Minor change: indentation of BC_ANIMATION_TYPE_FROM_NAME was wrong
Revision feda65d by Gaia Clary
April 17, 2018, 08:59 (GMT)
Cleanup Collada: Removed no longer needed method
Revision 7182940 by Gaia Clary
April 17, 2018, 08:59 (GMT)
Fix Collada: Import of animations for objects with multiple materials

When importing multiple materials for one object,
the imported material animation curves have all been
assigned to the first material in the object.

This fix also improves the console logging whenever the importer
finds a consistency problem with the imported animation data.
April 17, 2018, 08:36 (GMT)
Merge branch 'blender2.8' into topbar
April 16, 2018, 19:20 (GMT)
Cleanup: various warnings

Now compiles w/o warnings for GCC
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021