[Bf-blender-cvs] [fa82a15676e] master: Cleanup: remove unused struct members
Campbell Barton
noreply at git.blender.org
Sat Jan 9 09:16:38 CET 2021
Commit: fa82a15676eb37a7e73d1e3a0e8095684842376d
Author: Campbell Barton
Date: Sat Jan 9 19:03:11 2021 +1100
Branches: master
https://developer.blender.org/rBfa82a15676eb37a7e73d1e3a0e8095684842376d
Cleanup: remove unused struct members
Non-projection painting in the viewport is no longer supported,
remove struct members used for this.
===================================================================
M source/blender/editors/sculpt_paint/paint_image_2d.c
===================================================================
diff --git a/source/blender/editors/sculpt_paint/paint_image_2d.c b/source/blender/editors/sculpt_paint/paint_image_2d.c
index 29e2af01cac..f0923cf3d28 100644
--- a/source/blender/editors/sculpt_paint/paint_image_2d.c
+++ b/source/blender/editors/sculpt_paint/paint_image_2d.c
@@ -132,8 +132,6 @@ typedef struct ImagePaintState {
SpaceImage *sima;
View2D *v2d;
Scene *scene;
- bScreen *screen;
- struct ImagePool *image_pool;
Brush *brush;
short tool, blend;
@@ -142,11 +140,6 @@ typedef struct ImagePaintState {
bool do_masking;
- /* viewport texture paint only, but _not_ project paint */
- Object *ob;
- int faceindex;
- float uv[2];
- int do_facesel;
int symmetry;
ImagePaintTile *tiles;
@@ -1674,7 +1667,6 @@ void *paint_2d_new_stroke(bContext *C, wmOperator *op, int mode)
s->sima = CTX_wm_space_image(C);
s->v2d = &CTX_wm_region(C)->v2d;
s->scene = scene;
- s->screen = CTX_wm_screen(C);
s->brush = brush;
s->tool = brush->imagepaint_tool;
More information about the Bf-blender-cvs
mailing list