[Bf-blender-cvs] [1550fa3db63] greasepencil-object: World: Add temporary update flag.

Clément Foucault noreply at git.blender.org
Tue Jun 6 11:28:18 CEST 2017


Commit: 1550fa3db63f46ff52754c5e6053449392c10ba4
Author: Clément Foucault
Date:   Sun Jun 4 12:08:34 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB1550fa3db63f46ff52754c5e6053449392c10ba4

World: Add temporary update flag.

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

M	source/blender/editors/render/render_update.c
M	source/blender/makesdna/DNA_world_types.h

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

diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c
index ce52b9af4b2..74bb4c570e6 100644
--- a/source/blender/editors/render/render_update.c
+++ b/source/blender/editors/render/render_update.c
@@ -482,6 +482,9 @@ static void world_changed(Main *bmain, World *wo)
 
 	/* icons */
 	BKE_icon_changed(BKE_icon_id_ensure(&wo->id));
+
+	/* XXX temporary flag waiting for depsgraph proper tagging */
+	wo->update_flag = 1;
 	
 	/* glsl */
 	for (ma = bmain->mat.first; ma; ma = ma->id.next)
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h
index f3d3faecbb4..2ab99617ee8 100644
--- a/source/blender/makesdna/DNA_world_types.h
+++ b/source/blender/makesdna/DNA_world_types.h
@@ -120,7 +120,8 @@ typedef struct World {
 	
 	struct Ipo *ipo  DNA_DEPRECATED;  /* old animation system, deprecated for 2.5 */
 	struct MTex *mtex[18];		/* MAX_MTEX */
-	short pr_texture, use_nodes, pad[2];
+	short pr_texture, use_nodes, pad;
+	short update_flag;          /* XXX temporary flag waiting for depsgraph proper tagging */
 
 	/* previews */
 	struct PreviewImage *preview;




More information about the Bf-blender-cvs mailing list