Fix T46471: Sculpt strokes doesn't mark file as modified

[blender.git] / source / blender / editors / sculpt_paint / sculpt_intern.h

diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h
index 42205a8da0400939fea8898a4814537834d37ecb..51af8788e60629a723d48bfa789be38cbbac14a8 100644 (file)
--- a/source/blender/editors/sculpt_paint/sculpt_intern.h
+++ b/source/blender/editors/sculpt_paint/sculpt_intern.h
@@ -30,86 +30,105 @@
  */
  
 
  */
  
 

-#ifndef BDR_SCULPTMODE_H
-#define BDR_SCULPTMODE_H
+#ifndef __SCULPT_INTERN_H__
+#define __SCULPT_INTERN_H__

 
 #include "DNA_listBase.h"
 #include "DNA_vec_types.h"
 #include "DNA_key_types.h"
 
 
 #include "DNA_listBase.h"
 #include "DNA_vec_types.h"
 #include "DNA_key_types.h"
 

-#include "BLI_pbvh.h"
+#include "BLI_bitmap.h"
+#include "BKE_pbvh.h"

 
 struct bContext;
 
 struct bContext;

-struct Brush;

 struct KeyBlock;
 struct KeyBlock;

-struct Mesh;
-struct MultiresModifierData;

 struct Object;
 struct Object;

-struct Scene;
-struct Sculpt;
-struct SculptStroke;
-
-/* Interface */
-void sculptmode_selectbrush_menu(void);
-void sculptmode_draw_mesh(int);
-void sculpt_paint_brush(char clear);
-void sculpt_stroke_draw(struct SculptStroke *);
-void sculpt_radialcontrol_start(int mode);
-struct MultiresModifierData *sculpt_multires_active(struct Scene *scene, struct Object *ob);
-
-struct Brush *sculptmode_brush(void);
-
-void sculpt(Sculpt *sd);
+struct SculptUndoNode;

 
 

+int sculpt_mode_poll(struct bContext *C);
+int sculpt_mode_poll_view3d(struct bContext *C);
+/* checks for a brush, not just sculpt mode */

 int sculpt_poll(struct bContext *C);
 int sculpt_poll(struct bContext *C);

-void sculpt_update_mesh_elements(struct Scene *scene, struct Sculpt *sd, struct Object *ob, int need_fmap);
-
-/* Deformed mesh sculpt */
-void free_sculptsession_deformMats(struct SculptSession *ss);
+int sculpt_poll_view3d(struct bContext *C);

 
 /* Stroke */
 
 /* Stroke */

-struct SculptStroke *sculpt_stroke_new(const int max);
-void sculpt_stroke_free(struct SculptStroke *);
-void sculpt_stroke_add_point(struct SculptStroke *, const short x, const short y);
-void sculpt_stroke_apply(struct Sculpt *sd, struct SculptStroke *);
-void sculpt_stroke_apply_all(struct Sculpt *sd, struct SculptStroke *);
-int sculpt_stroke_get_location(bContext *C, struct PaintStroke *stroke, float out[3], float mouse[2]);
+bool sculpt_stroke_get_location(bContext *C, float out[3], const float mouse[2]);
+
+/* Dynamic topology */
+void sculpt_pbvh_clear(Object *ob);
+void sculpt_dyntopo_node_layers_add(struct SculptSession *ss);
+void sculpt_update_after_dynamic_topology_toggle(bContext *C);
+void sculpt_dynamic_topology_enable(struct bContext *C);
+void sculpt_dynamic_topology_disable(struct bContext *C,
+                                     struct SculptUndoNode *unode);

 
 /* Undo */
 
 
 /* Undo */
 

+typedef enum {
+       SCULPT_UNDO_COORDS,
+       SCULPT_UNDO_HIDDEN,
+       SCULPT_UNDO_MASK,
+       SCULPT_UNDO_DYNTOPO_BEGIN,
+       SCULPT_UNDO_DYNTOPO_END,
+       SCULPT_UNDO_DYNTOPO_SYMMETRIZE,
+} SculptUndoType;
+

 typedef struct SculptUndoNode {
        struct SculptUndoNode *next, *prev;
 
 typedef struct SculptUndoNode {
        struct SculptUndoNode *next, *prev;
 

-       char idname[MAX_ID_NAME];       /* name instead of pointer*/
-       void *node;                                     /* only during push, not valid afterwards! */
+       SculptUndoType type;
+
+       char idname[MAX_ID_NAME];   /* name instead of pointer*/
+       void *node;                 /* only during push, not valid afterwards! */

 
        float (*co)[3];
        float (*orig_co)[3];
        short (*no)[3];
 
        float (*co)[3];
        float (*orig_co)[3];
        short (*no)[3];

+       float *mask;

        int totvert;
 
        /* non-multires */
        int totvert;
 
        /* non-multires */

-       int maxvert;                            /* to verify if totvert it still the same */
-       int *index;                                     /* to restore into right location */
+       int maxvert;                /* to verify if totvert it still the same */
+       int *index;                 /* to restore into right location */
+       BLI_bitmap *vert_hidden;

 
        /* multires */
 
        /* multires */

-       int maxgrid;                            /* same for grid */
-       int gridsize;                           /* same for grid */
-       int totgrid;                            /* to restore into right location */
-       int *grids;                                     /* to restore into right location */
-
-       /* layer brush */
-       float *layer_disp;
+       int maxgrid;                /* same for grid */
+       int gridsize;               /* same for grid */
+       int totgrid;                /* to restore into right location */
+       int *grids;                 /* to restore into right location */
+       BLI_bitmap **grid_hidden;
+
+       /* bmesh */
+       struct BMLogEntry *bm_entry;
+       bool applied;
+       CustomData bm_enter_vdata;
+       CustomData bm_enter_edata;
+       CustomData bm_enter_ldata;
+       CustomData bm_enter_pdata;
+       int bm_enter_totvert;
+       int bm_enter_totedge;
+       int bm_enter_totloop;
+       int bm_enter_totpoly;

 
        /* shape keys */
        char shapeName[sizeof(((KeyBlock *)0))->name];
 } SculptUndoNode;
 
 
        /* shape keys */
        char shapeName[sizeof(((KeyBlock *)0))->name];
 } SculptUndoNode;
 

-SculptUndoNode *sculpt_undo_push_node(Object *ob, PBVHNode *node);
+SculptUndoNode *sculpt_undo_push_node(Object *ob, PBVHNode *node, SculptUndoType type);

 SculptUndoNode *sculpt_undo_get_node(PBVHNode *node);
 void sculpt_undo_push_begin(const char *name);
 SculptUndoNode *sculpt_undo_get_node(PBVHNode *node);
 void sculpt_undo_push_begin(const char *name);

-void sculpt_undo_push_end(void);
+void sculpt_undo_push_end(const struct bContext *C);

 
 void sculpt_vertcos_to_key(Object *ob, KeyBlock *kb, float (*vertCos)[3]);
 
 
 void sculpt_vertcos_to_key(Object *ob, KeyBlock *kb, float (*vertCos)[3]);
 

+void sculpt_update_object_bounding_box(struct Object *ob);
+
+/* Setting zero so we can catch bugs in OpenMP/sculpt. */
+#ifdef DEBUG
+#  define SCULPT_OMP_LIMIT 0
+#else
+#  define SCULPT_OMP_LIMIT 4
+#endif
+

 #endif
 #endif