blender
/
blender
134
398
Fork 579
Code Issues 6.3k Pull Requests 750 Projects 19 Wiki Activity

Initial Grease Pencil 3.0 stage #106848

Merged
Falk David merged 224 commits from filedescriptor/blender:grease-pencil-v3 into main 2023-05-30 11:14:22 +02:00
Conversation 8 Commits 224 Files Changed 94 +1 -30
1 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 22247394f5 - Show all commits

31
source/blender/draw/engines/gpencil/gpencil_object.hh
View File

@ -25,19 +25,7 @@ using namespace draw;
class ObjectModule {
private:
/* TODO(fclem): This is a workaround to the current GPencil data structure.
* Rendering is much easier if we have frame containing layers. */
struct LayerData {
/* Layer / Frame tuple representing a layer inside a frame. */
const bGPDlayer *gpl;
const bGPDframe *gpf;
};
struct FrameData {
/* First layer frame to access frame members. */
const bGPDframe *gpf;
Vector<LayerData, 8> layers;
};
LayerModule &layers_;
MaterialModule &materials_;
ShaderModule &shaders_;
@ -281,23 +269,6 @@ class ObjectModule {
// clamp_f(tint[3], 0.01f, 1.0f);
// return tint;
// }
// void displayed_frame_select(Vector<FrameData, 5> &frames,
// ListBaseWrapper<const bGPDlayer> layers)
// {
// /* TODO(fclem): Select onion skin frames. */
// /** \note Change data layout to be Frame major instead of Layer major.
// * Hopefully the GPencil data layout will be closer to that in the future. */
// FrameData frame_data;
// frame_data.gpf = layers.get(0)->actframe;
// for (const bGPDlayer *layer : layers) {
// LayerData layer_data;
// layer_data.gpf = layer->actframe;
// layer_data.gpl = layer;
// frame_data.layers.append(layer_data);
// }
// frames.append(frame_data);
// }
};
} // namespace blender::gpencil