Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +3 -1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 84b66c5a9c - Show all commits

2
source/blender/blenkernel/BKE_main.h
View File

@ -185,7 +185,7 @@ typedef struct Main {
ListBase particles; ListBase particles;
ListBase palettes; ListBase palettes;
ListBase paintcurves; ListBase paintcurves;
ListBase wm; /* Singleton (exception). */ ListBase wm; /* Singleton (exception). */
ListBase gpencils; /* Legacy Grease Pencil. */ ListBase gpencils; /* Legacy Grease Pencil. */
ListBase movieclips; ListBase movieclips;
ListBase masks; ListBase masks;

2
source/blender/blenkernel/CMakeLists.txt
View File

@ -496,6 +496,7 @@ set(SRC
nla_private.h nla_private.h
particle_private.h particle_private.h
tracking_private.h tracking_private.h
intern/CCGSubSurf.h intern/CCGSubSurf.h
intern/CCGSubSurf_inline.h intern/CCGSubSurf_inline.h
intern/CCGSubSurf_intern.h intern/CCGSubSurf_intern.h
@ -507,6 +508,7 @@ set(SRC
intern/multires_unsubdivide.h intern/multires_unsubdivide.h
intern/ocean_intern.h intern/ocean_intern.h
intern/pbvh_intern.hh intern/pbvh_intern.hh
intern/pbvh_pixels_copy.hh
intern/pbvh_uv_islands.hh intern/pbvh_uv_islands.hh
intern/subdiv_converter.h intern/subdiv_converter.h
intern/subdiv_inline.h intern/subdiv_inline.h