[Bf-blender-cvs] [dabf5931636] master: Fix T59877: EEVEE: Object Info node random value does not work with Duplis

Clément Foucault noreply at git.blender.org
Thu Mar 7 03:33:39 CET 2019


Commit: dabf5931636cf6797718da8329e4b537d294cb21
Author: Clément Foucault
Date:   Thu Mar 7 03:33:24 2019 +0100
Branches: master
https://developer.blender.org/rBdabf5931636cf6797718da8329e4b537d294cb21

Fix T59877: EEVEE: Object Info node random value does not work with Duplis

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

M	source/blender/draw/intern/draw_manager_data.c

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

diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c
index 53fbb8bb9cc..6f9e2cff36c 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -22,6 +22,7 @@
 
 #include "draw_manager.h"
 
+#include "BKE_anim.h"
 #include "BKE_curve.h"
 #include "BKE_global.h"
 #include "BKE_mesh.h"
@@ -326,13 +327,10 @@ static void drw_call_state_update_matflag(DRWCallState *state, DRWShadingGroup *
 	if ((new_flags & DRW_CALL_OBJECTINFO) != 0) {
 		state->objectinfo[0] = ob ? ob->index : 0;
 		uint random;
-#if 0 /* TODO(fclem) handle dupli objects */
-		if (GMS.dob) {
-			random = GMS.dob->random_id;
+		if (DST.dupli_source) {
+			random = DST.dupli_source->random_id;
 		}
-		else
-#endif
-		{
+		else {
 			random = BLI_hash_int_2d(BLI_hash_string(ob->id.name + 2), 0);
 		}
 		state->objectinfo[1] = random * (1.0f / (float)0xFFFFFFFF);



More information about the Bf-blender-cvs mailing list