[Bf-blender-cvs] [bbd1068] soc-2013-depsgraph_mt: Merge branch 'master' into soc-2013-depsgraph_mt

[Sergey Sharybin]

Commit: bbd1068ef722fbe5f4deed447d9637d65ab29657
Author: Sergey Sharybin
Date:   Mon Dec 23 13:46:13 2013 +0600
http://developer.blender.org/rBbbd1068ef722fbe5f4deed447d9637d65ab29657

Merge branch 'master' into soc-2013-depsgraph_mt

Conflicts:
	source/blender/editors/render/render_internal.c
	source/blender/modifiers/intern/MOD_smoke.c

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



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

diff --cc source/blender/editors/render/render_internal.c
index fdbee98,091dc11..f9f0681
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@@ -278,7 -302,9 +305,10 @@@ typedef struct RenderJob 
  	short *do_update;
  	float *progress;
  	ReportList *reports;
+ 	int orig_layer;
+ 	int last_layer;
+ 	ScrArea *sa;
 +	bool interface_locked;
  } RenderJob;
  
  static void render_freejob(void *rjv)
diff --cc source/blender/modifiers/intern/MOD_smoke.c
index ae6f9e3,22a4c87..fcd4cc9
--- a/source/blender/modifiers/intern/MOD_smoke.c
+++ b/source/blender/modifiers/intern/MOD_smoke.c
@@@ -104,9 -104,11 +104,12 @@@ static DerivedMesh *applyModifier(Modif
                                    ModifierApplyFlag flag)
  {
  	SmokeModifierData *smd = (SmokeModifierData *) md;
 +	bool for_render = (flag & MOD_APPLY_RENDER) != 0;
  
+ 	if (flag & MOD_APPLY_ORCO)
+ 		return dm;
+ 
 -	return smokeModifier_do(smd, md->scene, ob, dm);
 +	return smokeModifier_do(smd, md->scene, ob, dm, for_render);
  }
  
  static bool dependsOnTime(ModifierData *UNUSED(md))