diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-02 17:36:20 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-02 17:36:20 +0400 |
| commit | 40b3c3a4e68f853284fc4fa5e58694f85e1e07db (patch) | |
| tree | cfbc0ebc4ba8424c45a2c4c80dcaf6cc339d59a7 /intern/cycles/blender/blender_util.h | |
| parent | 87bc16a9a0d76eca88dbb6ac677d18a3208fba28 (diff) | |
RNA C++: fixes for lookup_int/lookup_string which were not working in some cases,
and don't use ReportList for function arguments.
Diffstat (limited to 'intern/cycles/blender/blender_util.h')
| -rw-r--r-- | intern/cycles/blender/blender_util.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h index 079320e909c..98460036d17 100644 --- a/intern/cycles/blender/blender_util.h +++ b/intern/cycles/blender/blender_util.h @@ -39,7 +39,7 @@ CCL_NAMESPACE_BEGIN static inline BL::Mesh object_to_mesh(BL::Object self, BL::Scene scene, bool apply_modifiers, bool render) { - return self.to_mesh(NULL, scene, apply_modifiers, (render)? 2: 1); + return self.to_mesh(scene, apply_modifiers, (render)? 2: 1); } static inline void colorramp_to_array(BL::ColorRamp ramp, float4 *data, int size) @@ -57,12 +57,12 @@ static inline void object_remove_mesh(BL::BlendData data, BL::Mesh mesh) /* TODO: BlendData.meshes ideally should be also a subclass of BlendDataMeshes */ BL::BlendDataMeshes mesh_data(data.ptr); - mesh_data.remove(NULL, mesh); + mesh_data.remove(mesh); } static inline void object_create_duplilist(BL::Object self, BL::Scene scene) { - self.dupli_list_create(NULL, scene, 2); + self.dupli_list_create(scene, 2); } static inline void object_free_duplilist(BL::Object self) |