[Bf-blender-cvs] [9edebfb] object_nodes: Minor fixes for compiling without LLVM.
Lukas Tönne
noreply at git.blender.org
Mon Apr 11 17:21:37 CEST 2016
Commit: 9edebfb9ab623f12f4b54babc12c30e431c3e0ce
Author: Lukas Tönne
Date: Mon Apr 11 17:21:20 2016 +0200
Branches: object_nodes
https://developer.blender.org/rB9edebfb9ab623f12f4b54babc12c30e431c3e0ce
Minor fixes for compiling without LLVM.
===================================================================
M source/blender/blenvm/intern/bvm_api.cc
===================================================================
diff --git a/source/blender/blenvm/intern/bvm_api.cc b/source/blender/blenvm/intern/bvm_api.cc
index af12603..21abac7 100644
--- a/source/blender/blenvm/intern/bvm_api.cc
+++ b/source/blender/blenvm/intern/bvm_api.cc
@@ -1061,6 +1061,7 @@ struct BVMFunction *BVM_gen_texture_function_llvm(bNodeTree *btree, bool use_cac
return (BVMFunction *)fn;
#else
UNUSED_VARS(btree, use_cache);
+ return NULL;
#endif
}
@@ -1134,7 +1135,7 @@ void BVM_eval_texture_llvm(struct BVMEvalContext *UNUSED(ctx), struct BVMFunctio
zero_v3(dyt_v.data());
result = fp(coord_v, dxt_v, dyt_v, cfra, osatex);
#else
- UNUSED_VARS(ctx, fn, coord, dxt, dyt, cfra, osatex);
+ UNUSED_VARS(fn, coord, dxt, dyt, cfra, osatex);
result.color = float4(0.0f, 0.0f, 0.0f, 0.0f);
result.normal = float3(0.0f, 0.0f, 1.0f);
#endif
More information about the Bf-blender-cvs
mailing list