Blender Git Loki

P

Use .cc extension instead of .cpp for C++ files

@sergey suggested to change since .cpp would be C-Pre-Processor.

Fix C++ files not able to call ED_region_tag_redraw

ED_screen.h needs to be compiled with C compiler.

Port widget-group-type unregister and widget-group free functions

Merge branch 'wiggly-widgets' into temp_widgets_c++_experiment

Fix glitch after canceling tweaking

Merge branch 'master' into wiggly-widgets

Conflicts:
release/scripts/modules/sys_info.py
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform_manipulator.c

Revert "Custom-Bake: new ui, enum-flags, doversion, ..."

This reverts commit a2d8384a7b37c18dd5223093063279453663d85b.

Custom-Bake: new ui, enum-flags, doversion, ...

Merge remote-tracking branch 'origin/master' into experimental-build

Merge branch 'master' into id-remap

Conflicts:
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_outliner/outliner_intern.h
source/blender/editors/space_outliner/outliner_tools.c

Merge branch 'master' into id-remap

Object pointer should not be needed for constructing modifier node functions.

Merge branch 'master' into object_nodes

Revert "Custom-Bake, test build"

This reverts commit bef519ae362427f263832e07aad19b9d09f9fc13.

Custom-Bake, test build

Merge remote-tracking branch 'origin/master' into experimental-build

Merge branch 'id-remap' into asset-experiments

Conflicts:
source/blender/blenloader/BLO_readfile.h
source/blender/blenloader/intern/readfile.c

Merge main remap funcs' bool parameters into a single bitflag.

Too much bools kill bools.

More cleanup - remove unused stuff, some simplifications.