forked from bartvdbraak/blender
2.5 Paint:
* Removed the BKE_sculpt file and moved it's contents (basically just the sculpt session struct) to BKE_paint
This commit is contained in:
parent
03b3d2cb79
commit
77c587a825
@ -29,9 +29,13 @@
|
||||
#define BKE_PAINT_H
|
||||
|
||||
struct Brush;
|
||||
struct MFace;
|
||||
struct MultireModifierData;
|
||||
struct MVert;
|
||||
struct Object;
|
||||
struct Paint;
|
||||
struct Scene;
|
||||
struct StrokeCache;
|
||||
|
||||
extern const char PAINT_CURSOR_SCULPT[3];
|
||||
extern const char PAINT_CURSOR_VERTEX_PAINT[3];
|
||||
@ -53,4 +57,39 @@ void paint_brush_slot_remove(struct Paint *p);
|
||||
* however hiding faces is useful */
|
||||
int paint_facesel_test(struct Object *ob);
|
||||
|
||||
/* Session data (mode-specific) */
|
||||
|
||||
typedef struct SculptSession {
|
||||
struct ProjVert *projverts;
|
||||
|
||||
/* Mesh data (not copied) can come either directly from a Mesh, or from a MultiresDM */
|
||||
struct MultiresModifierData *multires; /* Special handling for multires meshes */
|
||||
struct MVert *mvert;
|
||||
struct MFace *mface;
|
||||
int totvert, totface;
|
||||
float *face_normals;
|
||||
|
||||
/* Mesh connectivity */
|
||||
struct ListBase *fmap;
|
||||
struct IndexNode *fmap_mem;
|
||||
int fmap_size;
|
||||
|
||||
/* Used temporarily per-stroke */
|
||||
float *vertexcosnos;
|
||||
ListBase damaged_rects;
|
||||
ListBase damaged_verts;
|
||||
|
||||
/* Used to cache the render of the active texture */
|
||||
unsigned int texcache_side, *texcache, texcache_actual;
|
||||
|
||||
/* Layer brush persistence between strokes */
|
||||
float (*mesh_co_orig)[3]; /* Copy of the mesh vertices' locations */
|
||||
float *layer_disps; /* Displacements for each vertex */
|
||||
|
||||
struct SculptStroke *stroke;
|
||||
struct StrokeCache *cache;
|
||||
} SculptSession;
|
||||
|
||||
void free_sculptsession(SculptSession **);
|
||||
|
||||
#endif
|
||||
|
@ -1,72 +0,0 @@
|
||||
/*
|
||||
* $Id$
|
||||
*
|
||||
* ***** BEGIN GPL LICENSE BLOCK *****
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software Foundation,
|
||||
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*
|
||||
* The Original Code is Copyright (C) 2007 by Nicholas Bishop
|
||||
* All rights reserved.
|
||||
*
|
||||
* The Original Code is: all of this file.
|
||||
*
|
||||
* Contributor(s): none yet.
|
||||
*
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#ifndef BKE_SCULPT_H
|
||||
#define BKE_SCULPT_H
|
||||
|
||||
struct MFace;
|
||||
struct MultireModifierData;
|
||||
struct MVert;
|
||||
struct Object;
|
||||
struct StrokeCache;
|
||||
|
||||
typedef struct SculptSession {
|
||||
struct ProjVert *projverts;
|
||||
|
||||
/* Mesh data (not copied) can come either directly from a Mesh, or from a MultiresDM */
|
||||
struct MultiresModifierData *multires; /* Special handling for multires meshes */
|
||||
struct MVert *mvert;
|
||||
struct MFace *mface;
|
||||
int totvert, totface;
|
||||
float *face_normals;
|
||||
|
||||
/* Mesh connectivity */
|
||||
struct ListBase *fmap;
|
||||
struct IndexNode *fmap_mem;
|
||||
int fmap_size;
|
||||
|
||||
/* Used temporarily per-stroke */
|
||||
float *vertexcosnos;
|
||||
ListBase damaged_rects;
|
||||
ListBase damaged_verts;
|
||||
|
||||
/* Used to cache the render of the active texture */
|
||||
unsigned int texcache_side, *texcache, texcache_actual;
|
||||
|
||||
/* Layer brush persistence between strokes */
|
||||
float (*mesh_co_orig)[3]; /* Copy of the mesh vertices' locations */
|
||||
float *layer_disps; /* Displacements for each vertex */
|
||||
|
||||
struct SculptStroke *stroke;
|
||||
struct StrokeCache *cache;
|
||||
} SculptSession;
|
||||
|
||||
void free_sculptsession(SculptSession **);
|
||||
|
||||
#endif
|
@ -101,13 +101,13 @@
|
||||
#include "BKE_mball.h"
|
||||
#include "BKE_modifier.h"
|
||||
#include "BKE_object.h"
|
||||
#include "BKE_paint.h"
|
||||
#include "BKE_particle.h"
|
||||
#include "BKE_pointcache.h"
|
||||
#include "BKE_property.h"
|
||||
#include "BKE_sca.h"
|
||||
#include "BKE_scene.h"
|
||||
#include "BKE_screen.h"
|
||||
#include "BKE_sculpt.h"
|
||||
#include "BKE_softbody.h"
|
||||
|
||||
#include "LBM_fluidsim.h"
|
||||
|
@ -135,6 +135,7 @@
|
||||
#include "BKE_multires.h"
|
||||
#include "BKE_node.h" // for tree type defines
|
||||
#include "BKE_object.h"
|
||||
#include "BKE_paint.h"
|
||||
#include "BKE_particle.h"
|
||||
#include "BKE_pointcache.h"
|
||||
#include "BKE_property.h" // for get_ob_property
|
||||
@ -143,7 +144,6 @@
|
||||
#include "BKE_scene.h"
|
||||
#include "BKE_softbody.h" // sbNew()
|
||||
#include "BKE_bullet.h" // bsbNew()
|
||||
#include "BKE_sculpt.h"
|
||||
#include "BKE_sequence.h"
|
||||
#include "BKE_texture.h" // for open_plugin_tex
|
||||
#include "BKE_utildefines.h" // SWITCH_INT DATA ENDB DNA1 O_BINARY GLOB USER TEST REND
|
||||
|
@ -65,7 +65,6 @@
|
||||
#include "BKE_modifier.h"
|
||||
#include "BKE_multires.h"
|
||||
#include "BKE_paint.h"
|
||||
#include "BKE_sculpt.h"
|
||||
#include "BKE_texture.h"
|
||||
#include "BKE_utildefines.h"
|
||||
#include "BKE_colortools.h"
|
||||
|
@ -32,7 +32,6 @@
|
||||
|
||||
#include "DNA_listBase.h"
|
||||
#include "DNA_vec_types.h"
|
||||
#include "BKE_sculpt.h"
|
||||
|
||||
struct Brush;
|
||||
struct Mesh;
|
||||
|
Loading…
Reference in New Issue
Block a user