Differential D3719 Diff 11915 source/blender/makesrna/intern/rna_access.c

Changeset View

Standalone View

source/blender/makesrna/intern/rna_access.c

Context not available.
	}	}

	if (ELEM(override_op, IDOVERRIDESTATIC_OP_ADD, IDOVERRIDESTATIC_OP_SUBTRACT, IDOVERRIDESTATIC_OP_MULTIPLY) && !ptr_storage) {	if (ELEM(override_op, IDOVERRIDESTATIC_OP_ADD, IDOVERRIDESTATIC_OP_SUBTRACT, IDOVERRIDESTATIC_OP_MULTIPLY) && !ptr_storage) {
	/* We cannot apply 'diff' override operations without some refference storage.	/* We cannot apply 'diff' override operations without some reference storage.
	* This should typically only happen at read time of .blend file... */	* This should typically only happen at read time of .blend file... */
	return false;	return false;
	}	}

	if (ELEM(override_op, IDOVERRIDESTATIC_OP_ADD, IDOVERRIDESTATIC_OP_SUBTRACT, IDOVERRIDESTATIC_OP_MULTIPLY) && !prop_storage) {	if (ELEM(override_op, IDOVERRIDESTATIC_OP_ADD, IDOVERRIDESTATIC_OP_SUBTRACT, IDOVERRIDESTATIC_OP_MULTIPLY) && !prop_storage) {
	/* We cannot apply 'diff' override operations without some refference storage.	/* We cannot apply 'diff' override operations without some reference storage.
	* This should typically only happen at read time of .blend file... */	* This should typically only happen at read time of .blend file... */
	return false;	return false;
	}	}
Context not available.
	}	}

	/**	/**
	* Check whether reference and local overriden data match (are the same),	* Check whether reference and local overridden data match (are the same),
	* with respect to given restrictive sets of properties.	* with respect to given restrictive sets of properties.
	* If requested, will generate needed new property overrides, and/or restore values from reference.	* If requested, will generate needed new property overrides, and/or restore values from reference.
	*	*
Context not available.