[Bf-blender-cvs] [83ca36a] object_nodes: Object pointer should not be needed for constructing modifier node functions.

[Lukas Tönne]

Commit: 83ca36a6e99d255d21f25333fe6f12e5c2a18cbf
Author: Lukas Tönne
Date:   Fri Dec 18 16:27:52 2015 +0100
Branches: object_nodes
https://developer.blender.org/rB83ca36a6e99d255d21f25333fe6f12e5c2a18cbf

Object pointer should not be needed for constructing modifier node functions.

===================================================================

M       source/blender/blenkernel/intern/DerivedMesh.c
M       source/blender/blenvm/BVM_api.h
M       source/blender/blenvm/intern/bvm_api.cc
M       source/blender/makesrna/intern/rna_object_api.c

===================================================================

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c 
b/source/blender/blenkernel/intern/DerivedMesh.c
index 51bc8e2..bf13454 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1710,7 +1710,7 @@ static DerivedMesh *mesh_calc_modifier_nodes(Scene 
*UNUSED(scene), Object *ob, b
        
        struct BVMFunction *fn = BVM_function_cache_acquire(ntree);
        if (!fn) {
-               fn = BVM_gen_modifier_function(ob, ntree, NULL);
+               fn = BVM_gen_modifier_function(ntree, NULL);
                BVM_function_cache_set(ntree, fn);
        }
        
diff --git a/source/blender/blenvm/BVM_api.h b/source/blender/blenvm/BVM_api.h
index 3355786..ba6443c 100644
--- a/source/blender/blenvm/BVM_api.h
+++ b/source/blender/blenvm/BVM_api.h
@@ -141,7 +141,7 @@ void BVM_eval_texture(struct BVMEvalContext *context, 
struct BVMFunction *fn,
 struct DerivedMesh;
 struct Mesh;
 
-struct BVMFunction *BVM_gen_modifier_function(struct Object *ob, struct 
bNodeTree *btree, FILE *debug_file);
+struct BVMFunction *BVM_gen_modifier_function(struct bNodeTree *btree, FILE 
*debug_file);
 
 struct DerivedMesh *BVM_eval_modifier(struct BVMEvalGlobals *globals,
                                       struct BVMEvalContext *context,
diff --git a/source/blender/blenvm/intern/bvm_api.cc 
b/source/blender/blenvm/intern/bvm_api.cc
index d8f4b7d..972ef26 100644
--- a/source/blender/blenvm/intern/bvm_api.cc
+++ b/source/blender/blenvm/intern/bvm_api.cc
@@ -1002,7 +1002,7 @@ void BVM_eval_texture(struct BVMEvalContext *ctx, struct 
BVMFunction *fn,
 
 /* ------------------------------------------------------------------------- */
 
-struct BVMFunction *BVM_gen_modifier_function(struct Object */*ob*/, struct 
bNodeTree *btree, FILE *debug_file)
+struct BVMFunction *BVM_gen_modifier_function(struct bNodeTree *btree, FILE 
*debug_file)
 {
        using namespace bvm;
        
diff --git a/source/blender/makesrna/intern/rna_object_api.c 
b/source/blender/makesrna/intern/rna_object_api.c
index 84f5fe0..258ad1f 100644
--- a/source/blender/makesrna/intern/rna_object_api.c
+++ b/source/blender/makesrna/intern/rna_object_api.c
@@ -491,7 +491,7 @@ static void rna_Object_debug_nodes_graphviz(struct Object 
*ob, const char *filen
                if (geotree) {
                        struct BVMFunction *fn;
                        
-                       fn = BVM_gen_modifier_function(ob, geotree, f);
+                       fn = BVM_gen_modifier_function(geotree, f);
                        BVM_function_free(fn);
                }
        }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs