Differential D8955 Diff 29076 source/blender/io/collada/collada_utils.cpp

Changeset View

Standalone View

source/blender/io/collada/collada_utils.cpp

Context not available.

	double emission_strength = 0.0;	double emission_strength = 0.0;
	bc_get_float_from_shader(shader, emission_strength, "Emission Strength");	bc_get_float_from_shader(shader, emission_strength, "Emission Strength");
		emission_strength = fmin(emission_strength, 1.0); /* Collada does not support HDR color */
	if (emission_strength == 0.0) {	if (emission_strength == 0.0) {
	return bc_get_cot(default_color);	return bc_get_cot(default_color);
	}	}

	COLLADASW::ColorOrTexture cot = bc_get_cot_from_shader(shader, "Emission", default_color);	COLLADASW::ColorOrTexture cot = bc_get_cot_from_shader(shader, "Emission", default_color);

	/* Multiply in emission strength. If using texture, emission strength is not	if (cot.isColor()) {
	* supported. */	/* Multiply in emission strength. If using texture, emission strength is not supported. */
	COLLADASW::Color col = cot.getColor();	COLLADASW::Color col = cot.getColor();
	cot.getColor().set(emission_strength * col.getRed(),	cot.getColor().set(emission_strength * col.getRed(),
	emission_strength * col.getGreen(),	emission_strength * col.getGreen(),
	emission_strength * col.getBlue(),	emission_strength * col.getBlue(),
	col.getAlpha());	col.getAlpha());
		}
		brechtUnsubmitted Not Done Inline Actions I think it should clamp the combined emission strength and color, since there is nothing in Blender preventing the color to have values > 1. brecht: I think it should clamp the combined emission strength and color, since there is nothing in…

	return cot;	return cot;
	}	}
Context not available.