Joseph Eagar fae955fdb1 Fix merge error.

2022-08-31 10:04:23 -07:00

..

blendthumb

Cleanup: use sizeof() for better readability

2022-08-12 12:21:47 +10:00

blenfont

Cleanup: split font datafile loading into a function

2022-08-31 12:50:08 +10:00

blenkernel

Merge branch 'blender-v3.3-release'

2022-08-31 09:46:33 -07:00

blenlib

Mesh: Move material indices to a generic attribute

2022-08-31 09:09:01 -05:00

blenloader

Node: Mix node

2022-08-31 00:13:57 +01:00

blentranslation

IME Cleanup: Removal of BLT_lang_is_ime_supported

2022-06-07 10:03:26 -07:00

bmesh

Mesh: Move material indices to a generic attribute

2022-08-31 09:09:01 -05:00

compositor

Nodes: move NodeTreeRef functionality into node runtime data

2022-08-31 12:16:13 +02:00

datatoc

Cleanup: remove "<pep8 compliant>" from headers

2022-06-02 20:16:20 +10:00

depsgraph

Fix T98525: depsgraph for indirectly referenced ID Properties in drivers.

2022-08-31 19:00:38 +03:00

draw

Merge branch 'blender-v3.3-release'

2022-08-31 08:33:23 -07:00

editors

Fix merge error.

2022-08-31 10:04:23 -07:00

freestyle

Mesh: Move material indices to a generic attribute

2022-08-31 09:09:01 -05:00

functions

Geometry Nodes: Port sample curves node to new data-block

2022-07-22 09:59:28 -05:00

geometry

Mesh: Move material indices to a generic attribute

2022-08-31 09:09:01 -05:00

gpencil_modifiers

Mesh: Move material indices to a generic attribute

2022-08-31 09:09:01 -05:00

gpu

Mesh: Move material indices to a generic attribute

2022-08-31 09:09:01 -05:00

ikplugin

Cleanup: rename cnt to count

2022-03-16 11:58:22 +11:00

imbuf

Cleanup: use booleans

2022-08-26 15:58:32 +10:00

io

Merge branch 'blender-v3.3-release'

2022-08-31 09:46:33 -07:00

makesdna

Merge branch 'blender-v3.3-release'

2022-08-31 08:33:23 -07:00

makesrna

GPencil: Apply Brush Size to Outline thickness while drawing

2022-08-31 16:18:08 +02:00

modifiers

Fix compile error from merge.

2022-08-31 09:08:35 -07:00

nodes

Merge branch 'blender-v3.3-release'

2022-08-31 09:46:33 -07:00

python

Cleanup: use booleans

2022-08-26 15:58:32 +10:00

render

Mesh: Move material indices to a generic attribute

2022-08-31 09:09:01 -05:00

sequencer

Cleanup: use booleans

2022-08-26 15:58:32 +10:00

shader_fx

I18n: make Grease Pencil modifiers and shader FX translatable.

2022-08-01 13:58:23 +02:00

simulation

Cleanup: spelling in comments

2022-05-17 15:34:02 +10:00

windowmanager

Cleanup: break before the default case in switch statements

2022-08-31 16:01:29 +10:00

CMakeLists.txt

Compositor: Rename compositor build option

2022-08-09 15:59:56 +02:00