[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25739] trunk/blender/source/blender/ editors/render/render_preview.c: Revert previous preview render commit, causing some problems

Matt Ebb matt at mke3.net
Tue Jan 5 13:14:18 CET 2010


Revision: 25739
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25739
Author:   broken
Date:     2010-01-05 13:14:18 +0100 (Tue, 05 Jan 2010)

Log Message:
-----------
Revert previous preview render commit, causing some problems

Modified Paths:
--------------
    trunk/blender/source/blender/editors/render/render_preview.c

Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c	2010-01-05 12:12:26 UTC (rev 25738)
+++ trunk/blender/source/blender/editors/render/render_preview.c	2010-01-05 12:14:18 UTC (rev 25739)
@@ -1094,22 +1094,6 @@
 	}
 }
 
-static int preview_notifier_id(ShaderPreview *sp)
-{
-	switch (GS(sp->id)) {
-		case ID_MA:
-			return NC_MATERIAL;
-		case ID_TE:
-			return NC_TEXTURE;
-		case ID_WO:
-			return NC_WORLD;
-		case ID_LA:
-			return NC_LAMP;
-	}
-
-	return 0;
-}
-
 /* use same function for icon & shader, so the job manager
    does not run two of them at the same time. */
 
@@ -1144,7 +1128,7 @@
 	
 	/* setup job */
 	WM_jobs_customdata(steve, sp, shader_preview_free);
-	WM_jobs_timer(steve, 0.1, preview_notifier_id(sp), preview_notifier_id(sp));
+	WM_jobs_timer(steve, 0.1, NC_MATERIAL, NC_MATERIAL);
 	WM_jobs_callbacks(steve, common_preview_startjob, NULL, NULL);
 	
 	WM_jobs_start(CTX_wm_manager(C), steve);
@@ -1170,7 +1154,7 @@
 	
 	/* setup job */
 	WM_jobs_customdata(steve, sp, shader_preview_free);
-	WM_jobs_timer(steve, 0.1, preview_notifier_id(sp), preview_notifier_id(sp));
+	WM_jobs_timer(steve, 0.1, NC_MATERIAL, NC_MATERIAL);
 	WM_jobs_callbacks(steve, common_preview_startjob, NULL, shader_preview_updatejob);
 	
 	WM_jobs_start(CTX_wm_manager(C), steve);





More information about the Bf-blender-cvs mailing list