1 files changed, 12 insertions, 34 deletions

diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c
index 545ca41c9c0..69096ad7a08 100644
--- a/source/blender/blenkernel/intern/world.c
+++ b/source/blender/blenkernel/intern/world.c
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
+
 #include "MEM_guardedalloc.h"
 
 #include "DNA_world_types.h"
@@ -43,6 +44,7 @@
 #include "BLI_listbase.h"
 
 #include "BKE_animsys.h"
+#include "BKE_global.h"
 #include "BKE_icons.h"
 #include "BKE_library.h"
 #include "BKE_library_query.h"
@@ -51,19 +53,15 @@
 #include "BKE_node.h"
 #include "BKE_world.h"
 
+#include "DEG_depsgraph.h"
+
 #include "GPU_material.h"
 
 /** Free (or release) any data used by this world (does not free the world itself). */
 void BKE_world_free(World *wrld)
 {
-	int a;
-
 	BKE_animdata_free((ID *)wrld, false);
 
-	for (a = 0; a < MAX_MTEX; a++) {
-		MEM_SAFE_FREE(wrld->mtex[a]);
-	}
-
 	/* is no lib link block, but world extension */
 	if (wrld->nodetree) {
 		ntreeFreeTree(wrld->nodetree);
@@ -84,23 +82,9 @@ void BKE_world_init(World *wrld)
 	wrld->horr = 0.05f;
 	wrld->horg = 0.05f;
 	wrld->horb = 0.05f;
-	wrld->zenr = 0.01f;
-	wrld->zeng = 0.01f;
-	wrld->zenb = 0.01f;
-	wrld->skytype = 0;
-
-	wrld->exp = 0.0f;
-	wrld->exposure = wrld->range = 1.0f;
 
 	wrld->aodist = 10.0f;
-	wrld->aosamp = 5;
 	wrld->aoenergy = 1.0f;
-	wrld->ao_env_energy = 1.0f;
-	wrld->ao_indirect_energy = 1.0f;
-	wrld->ao_indirect_bounces = 1;
-	wrld->aobias = 0.05f;
-	wrld->ao_samp_method = WO_AOSAMP_HAMMERSLEY;
-	wrld->ao_approx_error = 0.25f;
 
 	wrld->preview = NULL;
 	wrld->miststa = 5.0f;
@@ -128,12 +112,6 @@ World *BKE_world_add(Main *bmain, const char *name)
  */
 void BKE_world_copy_data(Main *bmain, World *wrld_dst, const World *wrld_src, const int flag)
 {
-	for (int a = 0; a < MAX_MTEX; a++) {
-		if (wrld_src->mtex[a]) {
-			wrld_dst->mtex[a] = MEM_dupallocN(wrld_src->mtex[a]);
-		}
-	}
-
 	if (wrld_src->nodetree) {
 		/* Note: nodetree is *not* in bmain, however this specific case is handled at lower level
 		 *       (see BKE_libblock_copy_ex()). */
@@ -167,17 +145,9 @@ World *BKE_world_localize(World *wrld)
 	 * ... Once f*** nodes are fully converted to that too :( */
 
 	World *wrldn;
-	int a;
 
 	wrldn = BKE_libblock_copy_nolib(&wrld->id, false);
 
-	for (a = 0; a < MAX_MTEX; a++) {
-		if (wrld->mtex[a]) {
-			wrldn->mtex[a] = MEM_mallocN(sizeof(MTex), __func__);
-			memcpy(wrldn->mtex[a], wrld->mtex[a], sizeof(MTex));
-		}
-	}
-
 	if (wrld->nodetree)
 		wrldn->nodetree = ntreeLocalize(wrld->nodetree);
 
@@ -192,3 +162,11 @@ void BKE_world_make_local(Main *bmain, World *wrld, const bool lib_local)
 {
 	BKE_id_make_local_generic(bmain, &wrld->id, true, lib_local);
 }
+
+void BKE_world_eval(struct Depsgraph *depsgraph, World *world)
+{
+	DEG_debug_print_eval(depsgraph, __func__, world->id.name, world);
+	if (!BLI_listbase_is_empty(&world->gpumaterial)) {
+		world->update_flag = 1;
+	}
+}