This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.

Bastien Montagne f874aeef70 Merge branch 'master' into blender2.8 ...

Please **DO NOT** add changes from master when it's totally uneeded!

Changes to BLI_ area most certainly shall *always* be done in master,
there is absolutely no point in adding more diff between the two
branches than needed, will only makes merging more cumbersome!

Conflicts:
	CMakeLists.txt
	source/blender/blenlib/intern/math_vector_inline.c

2016-12-29 20:05:22 +01:00

..

CMakeLists.txt

Refactor translation code out of blenfont

2015-08-18 07:01:26 +10:00

image_buttons.c

UI: Correct tooltips for properties region toggle OP

2016-08-04 00:26:49 +02:00

image_draw.c

delete deprecated fdrawXORcirc function

2016-11-17 15:03:55 -05:00

image_edit.c

Skip scopes update for render result during rendering

2016-03-10 11:29:45 +05:00

image_intern.h

NDOF: compile 3D mouse code only if WITH_INPUT_NDOF

2016-08-18 00:22:18 -04:00

image_ops.c

Correct bad cast, unused var warning

2016-12-27 15:29:55 +11:00

space_image.c

NDOF: compile 3D mouse code only if WITH_INPUT_NDOF

2016-08-18 00:22:18 -04:00