[Bf-blender-cvs] [f8e9b34] temp_depsgraph_split_ubereval: Moved function declarations for modifier stack eval into BKE_modifier_calc.h.
Lukas Tönne
noreply at git.blender.org
Thu Apr 21 11:25:18 CEST 2016
Commit: f8e9b349e83572c358290a5c66afe60ef1bf7a92
Author: Lukas Tönne
Date: Thu Apr 21 11:24:42 2016 +0200
Branches: temp_depsgraph_split_ubereval
https://developer.blender.org/rBf8e9b349e83572c358290a5c66afe60ef1bf7a92
Moved function declarations for modifier stack eval into BKE_modifier_calc.h.
===================================================================
M source/blender/blenkernel/BKE_DerivedMesh.h
A source/blender/blenkernel/BKE_modifier_calc.h
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenkernel/intern/constraint.c
M source/blender/blenkernel/intern/crazyspace.c
M source/blender/blenkernel/intern/data_transfer.c
M source/blender/blenkernel/intern/dynamicpaint.c
M source/blender/blenkernel/intern/editderivedmesh.c
M source/blender/blenkernel/intern/fluidsim.c
M source/blender/blenkernel/intern/mesh.c
M source/blender/blenkernel/intern/modifier_calc.c
M source/blender/blenkernel/intern/multires.c
M source/blender/blenkernel/intern/object_dupli.c
M source/blender/blenkernel/intern/object_update.c
M source/blender/blenkernel/intern/paint.c
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/particle_system.c
M source/blender/blenkernel/intern/shrinkwrap.c
M source/blender/depsgraph/intern/depsgraph_build_nodes.cc
M source/blender/editors/armature/armature_skinning.c
M source/blender/editors/interface/resources.c
M source/blender/editors/mesh/editmesh_knife_project.c
M source/blender/editors/mesh/mesh_navmesh.c
M source/blender/editors/mesh/meshtools.c
M source/blender/editors/object/object_add.c
M source/blender/editors/object/object_data_transfer.c
M source/blender/editors/object/object_modifier.c
M source/blender/editors/object/object_relations.c
M source/blender/editors/object/object_vgroup.c
M source/blender/editors/physics/particle_edit.c
M source/blender/editors/physics/particle_object.c
M source/blender/editors/sculpt_paint/paint_hide.c
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/editors/sculpt_paint/paint_utils.c
M source/blender/editors/sculpt_paint/paint_vertex.c
M source/blender/editors/sculpt_paint/paint_vertex_proj.c
M source/blender/editors/sculpt_paint/sculpt_undo.c
M source/blender/editors/space_view3d/drawmesh.c
M source/blender/editors/space_view3d/drawobject.c
M source/blender/editors/space_view3d/view3d_iterators.c
M source/blender/editors/transform/transform_snap.c
M source/blender/editors/uvedit/uvedit_draw.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_object_api.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/modifiers/intern/MOD_meshdeform.c
M source/blender/python/bmesh/bmesh_py_types.c
M source/blender/python/mathutils/mathutils_bvhtree.c
M source/blender/render/intern/source/convertblender.c
M source/blender/render/intern/source/pointdensity.c
M source/gameengine/Converter/BL_ModifierDeformer.cpp
M source/gameengine/Ketsji/KX_NavMeshObject.cpp
===================================================================
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index bdb1d44..e44357c 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -661,9 +661,6 @@ void DM_interp_poly_data(
int *src_indices,
float *weights, int count, int dest_index);
-/* Temporary? A function to give a colorband to derivedmesh for vertexcolor ranges */
-void vDM_ColorBand_store(const struct ColorBand *coba, const char alert_color[4]);
-
/* UNUSED */
#if 0
/** Simple function to get me->totvert amount of vertices/normals,
@@ -673,84 +670,6 @@ DMCoNo *mesh_get_mapped_verts_nors(struct Scene *scene, struct Object *ob);
#endif
void mesh_get_mapped_verts_coords(DerivedMesh *dm, float (*r_cos)[3], const int totcos);
-/* */
-DerivedMesh *mesh_get_derived_final(
- struct Scene *scene, struct Object *ob,
- CustomDataMask dataMask);
-DerivedMesh *mesh_get_derived_deform(
- struct Scene *scene, struct Object *ob,
- CustomDataMask dataMask);
-
-DerivedMesh *mesh_create_derived_for_modifier(
- struct Scene *scene, struct Object *ob,
- struct ModifierData *md, int build_shapekey_layers);
-
-DerivedMesh *mesh_create_derived_render(
- struct Scene *scene, struct Object *ob,
- CustomDataMask dataMask);
-
-DerivedMesh *getEditDerivedBMesh(
- struct BMEditMesh *em, struct Object *ob,
- float (*vertexCos)[3]);
-
-DerivedMesh *mesh_create_derived_index_render(
- struct Scene *scene, struct Object *ob,
- CustomDataMask dataMask, int index);
-
-/* same as above but wont use render settings */
-DerivedMesh *mesh_create_derived(struct Mesh *me, float (*vertCos)[3]);
-DerivedMesh *mesh_create_derived_view(
- struct Scene *scene, struct Object *ob,
- CustomDataMask dataMask);
-DerivedMesh *mesh_create_derived_no_deform(
- struct Scene *scene, struct Object *ob,
- float (*vertCos)[3],
- CustomDataMask dataMask);
-DerivedMesh *mesh_create_derived_no_deform_render(
- struct Scene *scene, struct Object *ob,
- float (*vertCos)[3],
- CustomDataMask dataMask);
-/* for gameengine */
-DerivedMesh *mesh_create_derived_no_virtual(
- struct Scene *scene, struct Object *ob, float (*vertCos)[3],
- CustomDataMask dataMask);
-DerivedMesh *mesh_create_derived_physics(
- struct Scene *scene, struct Object *ob, float (*vertCos)[3],
- CustomDataMask dataMask);
-
-DerivedMesh *editbmesh_get_derived_base(
- struct Object *, struct BMEditMesh *em);
-DerivedMesh *editbmesh_get_derived_cage(
- struct Scene *scene, struct Object *,
- struct BMEditMesh *em, CustomDataMask dataMask);
-DerivedMesh *editbmesh_get_derived_cage_and_final(
- struct Scene *scene, struct Object *,
- struct BMEditMesh *em, CustomDataMask dataMask,
- DerivedMesh **r_final);
-
-DerivedMesh *object_get_derived_final(struct Object *ob, const bool for_render);
-
-float (*editbmesh_get_vertex_cos(struct BMEditMesh *em, int *r_numVerts))[3];
-bool editbmesh_modifier_is_enabled(struct Scene *scene, struct ModifierData *md, DerivedMesh *dm);
-void makeDerivedMesh(
- struct Scene *scene, struct Object *ob, struct BMEditMesh *em,
- CustomDataMask dataMask, const bool build_shapekey_layers);
-
-void BKE_object_eval_mesh(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
-void BKE_object_eval_editmesh(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
-
-void weight_to_rgb(float r_rgb[3], const float weight);
-/** Update the weight MCOL preview layer.
- * If weights are NULL, use object's active vgroup(s).
- * Else, weights must be an array of weight float values.
- * If indices is NULL, it must be of numVerts length.
- * Else, it must be of num length, as indices, which contains vertices' idx to apply weights to.
- * (other vertices are assumed zero weight).
- */
-void DM_update_weight_mcol(
- struct Object *ob, struct DerivedMesh *dm, int const draw_flag,
- float *weights, int num, const int *indices);
-
/** convert layers requested by a GLSL material to actually available layers in
* the DerivedMesh, with both a pointer for arrays and an offset for editmesh */
typedef struct DMVertexAttribs {
diff --git a/source/blender/blenkernel/BKE_modifier_calc.h b/source/blender/blenkernel/BKE_modifier_calc.h
new file mode 100644
index 0000000..de99971
--- /dev/null
+++ b/source/blender/blenkernel/BKE_modifier_calc.h
@@ -0,0 +1,144 @@
+/*
+ * ***** 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef __BKE_MODIFIER_CALC_H__
+#define __BKE_MODIFIER_CALC_H__
+
+/** \file BKE_modifier_calc.h
+ * \ingroup bke
+ */
+
+#include "DNA_customdata_types.h"
+#include "DNA_meshdata_types.h"
+
+#include "BLI_compiler_attrs.h"
+
+#include "BKE_customdata.h"
+#include "BKE_bvhutils.h"
+
+struct CCGElem;
+struct CCGKey;
+struct MVert;
+struct MEdge;
+struct MFace;
+struct MTFace;
+struct Object;
+struct Scene;
+struct Mesh;
+struct MLoopNorSpaceArray;
+struct BMEditMesh;
+struct KeyBlock;
+struct ModifierData;
+struct MCol;
+struct ColorBand;
+struct GPUVertexAttribs;
+struct GPUDrawObject;
+struct PBVH;
+struct EvaluationContext;
+
+/* Temporary? A function to give a colorband to derivedmesh for vertexcolor ranges */
+void vDM_ColorBand_store(const struct ColorBand *coba, const char alert_color[4]);
+
+/* */
+struct DerivedMesh *mesh_get_derived_final(
+ struct Scene *scene, struct Object *ob,
+ CustomDataMask dataMask);
+struct DerivedMesh *mesh_get_derived_deform(
+ struct Scene *scene, struct Object *ob,
+ CustomDataMask dataMask);
+
+struct DerivedMesh *mesh_create_derived_for_modifier(
+ struct Scene *scene, struct Object *ob,
+ struct ModifierData *md, int build_shapekey_layers);
+
+struct DerivedMesh *mesh_create_derived_render(
+ struct Scene *scene, struct Object *ob,
+ CustomDataMask dataMask);
+
+struct DerivedMesh *getEditDerivedBMesh(
+ struct BMEditMesh *em, struct Object *ob,
+ float (*vertexCos)[3]);
+
+struct DerivedMesh *mesh_create_derived_index_render(
+ struct Scene *scene, struct Object *ob,
+ CustomDataMask dataMask, int index);
+
+/* same as above but wont use render settings */
+struct DerivedMesh *mesh_create_derived(struct Mesh *me, float (*vertCos)[3]);
+struct DerivedMesh *mesh_create_derived_view(
+ struct Scene *scene, struct Object *ob,
+ CustomDataMask dataMask);
+struct DerivedMesh *mesh_create_derived_no_deform(
+ struct Scene *scene, struct Object *ob,
+ float (*vertCos)[3],
+ CustomDataMask dataMask);
+struct DerivedMesh *mesh_create_derived_no_deform_render(
+ struct Scene *scene, struct Object *ob,
+ float (*vertCos)[3],
+ CustomDataMask dataMask);
+/* for gameengine */
+struct DerivedMesh *mesh_create_derived_no_virtual(
+ struct Scene *scene, struct Object *ob, float (*vertCos)[3],
+ CustomDataMask dataMask);
+struct DerivedMesh *mesh_create_derived_physics(
+ struct Scene *scene, struct Object *ob, float (*vertCos)[3],
+ CustomDataMask dataMask);
+
+struct DerivedMesh *editbmesh_get_derived_base(
+ struct Object *, struct BMEditMesh *em);
+struct DerivedMesh *editbmesh_get_derived_cage(
+ struct Scene *scene, struct Object *,
+ struct BMEditMesh *em, CustomDataMask dataMask);
+struct DerivedMesh *editbmesh_get_derived_cage_and_final(
+ struct Scene *scene, struct Object *,
+ struct BMEditMesh *em, CustomDataMask dataMask,
+ struct DerivedMesh **r_final);
+
+struct DerivedMesh *object_get_derived_final(struct Object *ob, const bool for_render);
+
+float (*editbmesh_get_vertex_cos(struct BMEditMesh *em, int *r_numVerts))[3];
+bool editbmesh_modifier_is_enabled(struct Scene *scene, struct ModifierData *md, struct DerivedMesh *dm);
+void makeDerivedMesh(
+ struct Scene *scene, struct Object *ob, struct BMEditMesh *em,
+ CustomDataMask dataMask, const bool build_shapekey_layers);
+
+void BKE_object_eval_mesh(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
+void BKE_object_eval_editmesh(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
+
+void weight_to_rgb(float r_rgb[3], const float weight);
+/** Update the weight MCOL preview layer.
+ * If weights are NULL, use object's active vgroup(s).
+ * Else, weights must be an array of weight float values.
+ * If indices is NULL, it must be of numVerts length.
+ * Else, it must be of num length, as indices, which contains vertices' idx to apply weights to.
+ * (other vertices are assumed zero weight).
+ */
+void DM_update_weight_mcol(
+ struct Object *ob, struct DerivedMesh *dm, int const draw_flag,
+ float *weights, int num, const int *indices);
+
+#endif /* __BKE_MODIFIER_CALC_H__ */
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 1c31df5..247314e 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -249,6 +249,7 @@ set(SRC
BKE_mesh_ma
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list