Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2017-04-18 17:06:01 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-04-18 17:29:42 +0300
commitbc6a75b405c4e0b1e85c9c6ec6646fd2d3f67686 (patch)
tree1dd28ef80fa66fc0703ead335e2801fa10aa6ec4 /source/blender/blenkernel
parentb8fd6f94a06c65f6bfe90d9cc45ae1406cd0dc27 (diff)
Revert "Object Info node support for GLSL mode and the internal render"
This reverts commit 76425feed8644a8fe1c0e52ef3f77b95012ba44e. ** Note ** This was supposed to be a merge, but it was rebased.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/object_dupli.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c
index 9a70c42418f..668c94bec8a 100644
--- a/source/blender/blenkernel/intern/object_dupli.c
+++ b/source/blender/blenkernel/intern/object_dupli.c
@@ -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;
}