[Bf-blender-cvs] [49a608a] cycles_point_density: Cycles point density: Fix crash when source object is not set

[Sergey Sharybin]

Commit: 49a608aaecfd0f79bd93e4543aee8e7d9b128621
Author: Sergey Sharybin
Date:   Wed Apr 1 14:37:34 2015 +0500
Branches: cycles_point_density
https://developer.blender.org/rB49a608aaecfd0f79bd93e4543aee8e7d9b128621

Cycles point density: Fix crash when source object is not set

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

M	intern/cycles/blender/blender_shader.cpp

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

diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index ab20999..58441bd 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -740,12 +740,14 @@ static ShaderNode *add_node(Scene *scene, BL::BlendData b_data, BL::Scene b_scen
 		point_density->builtin_data = b_point_density_node.ptr.data;
 
 		/* Transformation form world space to texture space. */
-		float3 loc, size;
 		BL::Object b_ob(b_point_density_node.object());
-		point_density_texture_space(b_point_density_node, loc, size);
-		point_density->tfm =
-		        transform_translate(-loc) * transform_scale(size) *
-		        transform_inverse(get_transform(b_ob.matrix_world()));
+		if(b_ob) {
+			float3 loc, size;
+			point_density_texture_space(b_point_density_node, loc, size);
+			point_density->tfm =
+			        transform_translate(-loc) * transform_scale(size) *
+			        transform_inverse(get_transform(b_ob.matrix_world()));
+		}
 
 		/* TODO(sergey): Use more proper update flag. */
 		if(true) {