blender
/
blender
135
403
Fork 586
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

WIP: Onion Skinning Prototype #107641

Closed
Christoph Lendenfeld wants to merge 22 commits from ChrisLend/blender:onion_skin_test into main
pull from: ChrisLend/blender:onion_skin_test
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 22 Files Changed 20 +12 -12
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9d0717ba70 - Show all commits

24
source/blender/makesdna/DNA_scene_types.h
View File

@ -23,7 +23,6 @@
#include "DNA_customdata_types.h" /* Scene's runtime custom-data masks. */
#include "DNA_layer_types.h"
#include "DNA_listBase.h"
#include "DNA_mesh_types.h"
#include "DNA_vec_types.h"
#include "DNA_view3d_types.h"
@ -1849,6 +1848,18 @@ typedef struct SceneGpencil {
char _pad[4];
} SceneGpencil;
typedef struct OnionSkinMesh {
struct OnionSkinMesh *prev, *next;
/* Having a Mesh pointer here breaks compilation. Complains about "extern C" issues. */
void *mesh;
} OnionSkinMesh;
typedef struct SceneOnionSkin {
float color[3];
float alpha;
ListBase meshes /* OnionSkinMesh */;
} SceneOnionSkin;
/** \} */
/* -------------------------------------------------------------------- */
@ -1876,17 +1887,6 @@ enum {
/** \name Scene ID-Block
* \{ */
typedef struct OnionSkinMesh {
struct OnionSkinMesh *prev, *next;
Mesh *mesh;
} OnionSkinMesh;
typedef struct SceneOnionSkin {
float color[3];
float alpha;
ListBase meshes /* OnionSkinMesh */;
} SceneOnionSkin;
typedef struct Scene {
ID id;
/** Animation data (must be immediately after id for utilities to use it). */