[Bf-blender-cvs] [9cbdfdb] object_nodes: Merge branch 'master' into object_nodes
Lukas Tönne
noreply at git.blender.org
Sun Jan 24 14:44:07 CET 2016
Commit: 9cbdfdbdfa2c7b3f8a8f0274c35194571a0d11ca
Author: Lukas Tönne
Date: Sun Jan 24 14:24:30 2016 +0100
Branches: object_nodes
https://developer.blender.org/rB9cbdfdbdfa2c7b3f8a8f0274c35194571a0d11ca
Merge branch 'master' into object_nodes
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/depsgraph.c
index 10ab3cf,7f73e8f..61aeed5
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@@ -763,9 -761,13 +763,13 @@@ static void build_dag_object(DagForest
BoidRule *rule = NULL;
BoidState *state = NULL;
ParticleSettings *part = psys->part;
- ListBase *effectors = NULL;
+ EffectorContext *effectors;
EffectorCache *eff;
+ if (part->adt) {
+ dag_add_driver_relation(part->adt, dag, node, 1);
+ }
+
dag_add_relation(dag, node, node, DAG_RL_OB_DATA, "Particle-Object Relation");
if (!psys_check_enabled(ob, psys))
diff --cc source/blender/blenkernel/intern/smoke.c
index ebcce55,c7215cc..b3be00f
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@@ -2457,10 -2468,10 +2468,10 @@@ static void update_effectors(Scene *sce
data.velocity_z = smoke_get_velocity_z(sds->fluid);
data.obstacle = smoke_get_obstacle(sds->fluid);
- BLI_task_parallel_range_ex(0, sds->res[0], &data, NULL, 0, update_effectors_task_cb, true, false);
+ BLI_task_parallel_range(0, sds->res[0], &data, update_effectors_task_cb, true);
}
- pdEndEffectors(&effectors);
+ pdEndEffectors(effectors);
}
static void step(Scene *scene, Object *ob, SmokeModifierData *smd, DerivedMesh *domain_dm, float fps)
diff --cc source/blender/blenvm/bvm/bvm_eval_mesh.h
index da70985,0000000..e026b13
mode 100644,000000..100644
--- a/source/blender/blenvm/bvm/bvm_eval_mesh.h
+++ b/source/blender/blenvm/bvm/bvm_eval_mesh.h
@@@ -1,543 -1,0 +1,543 @@@
+/*
+ * ***** 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) Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Lukas Toenne
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef __BVM_EVAL_MESH_H__
+#define __BVM_EVAL_MESH_H__
+
+/** \file bvm_eval_mesh.h
+ * \ingroup bvm
+ */
+
+extern "C" {
+#include "BLI_math.h"
+
+#include "DNA_object_types.h"
+
+#include "bmesh.h"
+#include "bmesh_tools.h"
+#include "tools/bmesh_intersect.h"
+}
+
+#include "bvm_eval_common.h"
+
+namespace bvm {
+
+static void eval_op_mesh_load(EvalStack *stack, StackIndex offset_base_mesh, StackIndex offset_mesh)
+{
+ PointerRNA ptr = stack_load_rnapointer(stack, offset_base_mesh);
+ DerivedMesh *dm;
+ if (ptr.data && RNA_struct_is_a(&RNA_Mesh, ptr.type)) {
+ dm = CDDM_from_mesh((Mesh *)ptr.data);
+ }
+ else {
+ dm = CDDM_new(0, 0, 0, 0, 0);
+ }
+ stack_store_mesh(stack, offset_mesh, dm);
+}
+
+static void eval_op_object_final_mesh(EvalStack *stack,
+ StackIndex offset_object,
+ StackIndex offset_mesh)
+{
+ PointerRNA ptr = stack_load_rnapointer(stack, offset_object);
+
+ DerivedMesh *result = NULL;
+ if (ptr.data && RNA_struct_is_a(&RNA_Object, ptr.type)) {
+ Object *ob = (Object *)ptr.data;
+ result = ob->derivedFinal;
+ }
+ if (!result)
+ result = CDDM_new(0, 0, 0, 0, 0);
+
+ stack_store_mesh(stack, offset_mesh, result);
+}
+
+static void dm_insert(
+ DerivedMesh *result, DerivedMesh *dm,
+ int ofs_verts, int ofs_edges, int ofs_loops, int ofs_polys)
+{
+ int *index_orig;
+ int i;
+ MVert *mv;
+ MEdge *me;
+ MLoop *ml;
+ MPoly *mp;
+
+ /* needed for subsurf so arrays are allocated */
+ dm->getVertArray(dm);
+ dm->getEdgeArray(dm);
+ dm->getLoopArray(dm);
+ dm->getPolyArray(dm);
+
+ int cap_nverts = dm->getNumVerts(dm);
+ int cap_nedges = dm->getNumEdges(dm);
+ int cap_nloops = dm->getNumLoops(dm);
+ int cap_npolys = dm->getNumPolys(dm);
+
+ DM_copy_vert_data(dm, result, 0, ofs_verts, cap_nverts);
+ DM_copy_edge_data(dm, result, 0, ofs_edges, cap_nedges);
+ DM_copy_loop_data(dm, result, 0, ofs_loops, cap_nloops);
+ DM_copy_poly_data(dm, result, 0, ofs_polys, cap_npolys);
+
+ mv = CDDM_get_verts(result) + ofs_verts;
+
+ for (i = 0; i < cap_nverts; i++, mv++) {
+ /* Reset MVert flags for caps */
+ mv->flag = mv->bweight = 0;
+ }
+
+ /* adjust cap edge vertex indices */
+ me = CDDM_get_edges(result) + ofs_edges;
+ for (i = 0; i < cap_nedges; i++, me++) {
+ me->v1 += ofs_verts;
+ me->v2 += ofs_verts;
+ }
+
+ /* adjust cap poly loopstart indices */
+ mp = CDDM_get_polys(result) + ofs_polys;
+ for (i = 0; i < cap_npolys; i++, mp++) {
+ mp->loopstart += ofs_loops;
+ }
+
+ /* adjust cap loop vertex and edge indices */
+ ml = CDDM_get_loops(result) + ofs_loops;
+ for (i = 0; i < cap_nloops; i++, ml++) {
+ ml->v += ofs_verts;
+ ml->e += ofs_edges;
+ }
+
+ /* set origindex */
+ index_orig = (int *)result->getVertDataArray(result, CD_ORIGINDEX);
+ if (index_orig) {
+ copy_vn_i(index_orig + ofs_verts, cap_nverts, ORIGINDEX_NONE);
+ }
+
+ index_orig = (int *)result->getEdgeDataArray(result, CD_ORIGINDEX);
+ if (index_orig) {
+ copy_vn_i(index_orig + ofs_edges, cap_nedges, ORIGINDEX_NONE);
+ }
+
+ index_orig = (int *)result->getPolyDataArray(result, CD_ORIGINDEX);
+ if (index_orig) {
+ copy_vn_i(index_orig + ofs_polys, cap_npolys, ORIGINDEX_NONE);
+ }
+
+ index_orig = (int *)result->getLoopDataArray(result, CD_ORIGINDEX);
+ if (index_orig) {
+ copy_vn_i(index_orig + ofs_loops, cap_nloops, ORIGINDEX_NONE);
+ }
+}
+
+static void eval_op_mesh_combine(const EvalKernelData */*kernel_data*/, EvalStack *stack,
+ StackIndex offset_mesh_a, StackIndex offset_mesh_b, StackIndex offset_mesh_out)
+{
+ DerivedMesh *dm_a = stack_load_mesh(stack, offset_mesh_a);
+ DerivedMesh *dm_b = stack_load_mesh(stack, offset_mesh_b);
+
+ int numVertsA = dm_a->getNumVerts(dm_a);
+ int numEdgesA = dm_a->getNumEdges(dm_a);
+ int numTessFacesA = dm_a->getNumTessFaces(dm_a);
+ int numLoopsA = dm_a->getNumLoops(dm_a);
+ int numPolysA = dm_a->getNumPolys(dm_a);
+ int numVertsB = dm_b->getNumVerts(dm_b);
+ int numEdgesB = dm_b->getNumEdges(dm_b);
+ int numTessFacesB = dm_b->getNumTessFaces(dm_b);
+ int numLoopsB = dm_b->getNumLoops(dm_b);
+ int numPolysB = dm_b->getNumPolys(dm_b);
+
+ DerivedMesh *result = CDDM_new(numVertsA + numVertsB,
+ numEdgesA + numEdgesB,
+ numTessFacesA + numTessFacesB,
+ numLoopsA + numLoopsB,
+ numPolysA + numPolysB);
+
+ dm_insert(result, dm_a, 0, 0, 0, 0);
+ dm_insert(result, dm_b, numVertsA, numEdgesA, numLoopsA, numPolysA);
+
+ stack_store_mesh(stack, offset_mesh_out, result);
+}
+
+static DerivedMesh *do_array(const EvalGlobals *globals, const EvalKernelData *kernel_data, EvalStack *stack,
+ DerivedMesh *dm, int count,
+ int fn_transform, StackIndex offset_transform, StackIndex offset_iteration)
+{
+ const bool use_recalc_normals = (dm->dirty & DM_DIRTY_NORMALS);
+
+ int chunk_nverts = dm->getNumVerts(dm);
+ int chunk_nedges = dm->getNumEdges(dm);
+ int chunk_nloops = dm->getNumLoops(dm);
+ int chunk_npolys = dm->getNumPolys(dm);
+
+ /* The number of verts, edges, loops, polys, before eventually merging doubles */
+ int result_nverts = chunk_nverts * count;
+ int result_nedges = chunk_nedges * count;
+ int result_nloops = chunk_nloops * count;
+ int result_npolys = chunk_npolys * count;
+
+ /* Initialize a result dm */
+ MVert *orig_dm_verts = dm->getVertArray(dm);
+ DerivedMesh *result = CDDM_from_template(dm, result_nverts, result_nedges, 0, result_nloops, result_npolys);
+ MVert *result_dm_verts = CDDM_get_verts(result);
+
+ /* copy customdata to original geometry */
+ DM_copy_vert_data(dm, result, 0, 0, chunk_nverts);
+ DM_copy_edge_data(dm, result, 0, 0, chunk_nedges);
+ DM_copy_loop_data(dm, result, 0, 0, chunk_nloops);
+ DM_copy_poly_data(dm, result, 0, 0, chunk_npolys);
+
+#if 0 /* XXX is this needed? comment is unintelligible */
+ /* subsurf for eg wont have mesh data in the
+ * now add mvert/medge/mface layers */
+
+ if (!CustomData_has_layer(&dm->vertData, CD_MVERT)) {
+ dm->copyVertArray(dm, result_dm_verts);
+ }
+ if (!CustomData_has_layer(&dm->edgeData, CD_MEDGE)) {
+ dm->copyEdgeArray(dm, CDDM_get_edges(result));
+ }
+ if (!CustomData_has_layer(&dm->polyData, CD_MPOLY)) {
+ dm->copyLoopArray(dm, CDDM_get_loops(result));
+ dm->copyPolyArray(dm, CDDM_get_polys(result));
+ }
+#endif
+
+ for (int c = 0; c < count; c++) {
+ /* copy customdata to new geometry */
+ DM_copy_vert_data(result, result, 0, c * chunk_nverts, chunk_nverts);
+ DM_copy_edge_data(result, result, 0, c * chunk_nedges, chunk_nedges);
+ DM_copy_loop_data(result, result, 0, c * chunk_nloops, chunk_nloops);
+ DM_copy_poly_data(result, result, 0, c * chunk_npolys, chunk_npolys);
+
+ /* calculate transform for the copy */
+ stack_store_int(stack, offset_iteration, c);
+ kernel_data->context->eval_expression(globals, kernel_data->function, fn_transform, stack);
+ matrix44 tfm = stack_load_matrix44(stack, offset_transform);
+
+ /* apply offset to all new verts */
+ MVert *mv_orig = orig_dm_verts;
+ MVert *mv = result_dm_verts + c * chunk_nverts;
+ for (int i = 0; i < chunk_nverts; i++, mv++, mv_orig++) {
+ mul_v3_m4v3(mv->co, tfm.data, mv_orig->co);
+
+ /* We have to correct normals too, if we do not tag them as dirty! */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list