archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Revert "Object Info node support for GLSL mode and the internal render"

Browse Source 
This reverts commit 76425feed8.

** Note **
This was supposed to be a merge, but it was rebased.
This commit is contained in:
Dalai Felinto
2017-04-18 16:06:01 +02:00
parent b8fd6f94a0
commit bc6a75b405
20 changed files with 26 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/blenkernel/intern/object_dupli.c
View File

@@ -64,7 +64,6 @@
#include "DEG_depsgraph.h"
#include "BLI_strict_flags.h"
#include "BLI_hash.h"
/* Dupli-Geometry */
@@ -181,22 +180,6 @@ static DupliObject *make_dupli(const DupliContext *ctx,
if (ob->type == OB_MBALL)
dob->no_draw = true;
/* random number */
/* the logic here is designed to match Cycles */
dob->random_id = BLI_hash_string(dob->ob->id.name + 2);
if (dob->persistent_id[0] != INT_MAX) {
for(i = 0; i < MAX_DUPLI_RECUR*2; i++)
dob->random_id = BLI_hash_int_2d(dob->random_id, (unsigned int)dob->persistent_id[i]);
}
else {
dob->random_id = BLI_hash_int_2d(dob->random_id, 0);
}
if (ctx->object != ob) {
dob->random_id ^= BLI_hash_int(BLI_hash_string(ctx->object->id.name + 2));
}
return dob;
}