[Bf-blender-cvs] [054d7038cc9] blender2.8: Merge branch 'master' into blender2.8

Sergey Sharybin noreply at git.blender.org
Mon Apr 23 14:55:44 CEST 2018


Commit: 054d7038cc97ee022baec6aef7c6e6deff0e56f1
Author: Sergey Sharybin
Date:   Mon Apr 23 14:55:38 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB054d7038cc97ee022baec6aef7c6e6deff0e56f1

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/depsgraph/intern/depsgraph.cc
index a87358187f2,34fb20ee2ba..c90279b0e90
--- a/source/blender/depsgraph/intern/depsgraph.cc
+++ b/source/blender/depsgraph/intern/depsgraph.cc
@@@ -232,10 -214,11 +232,15 @@@ static bool pointer_to_component_node_c
  		*subdata = seq->name; // xxx?
  		return true;
  	}
 +	else if (RNA_struct_is_a(ptr->type, &RNA_NodeSocket)) {
 +		*type = DEG_NODE_TYPE_SHADING;
 +		return true;
 +	}
+ 	else if (ptr->type == &RNA_Curve) {
+ 		*id = (ID *)ptr->id.data;
+ 		*type = DEG_NODE_TYPE_GEOMETRY;
+ 		return true;
+ 	}
  	if (prop != NULL) {
  		/* All unknown data effectively falls under "parameter evaluation". */
  		if (RNA_property_is_idprop(prop)) {



More information about the Bf-blender-cvs mailing list