[Bf-blender-cvs] [fbed29a] temp_remove_particles: Merge branch 'master' into temp_remove_particles

Lukas Tönne noreply at git.blender.org
Fri Apr 15 18:03:37 CEST 2016


Commit: fbed29a246ed51023c3303115d060d7a455b4fc2
Author: Lukas Tönne
Date:   Fri Apr 15 17:59:54 2016 +0200
Branches: temp_remove_particles
https://developer.blender.org/rBfbed29a246ed51023c3303115d060d7a455b4fc2

Merge branch 'master' into temp_remove_particles

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



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

diff --cc source/blender/makesrna/intern/rna_texture.c
index d676249,1e88585..959f301
--- a/source/blender/makesrna/intern/rna_texture.c
+++ b/source/blender/makesrna/intern/rna_texture.c
@@@ -246,29 -247,29 +246,15 @@@ void rna_TextureSlot_update(Main *UNUSE
  		{
  			MTex *mtex = ptr->data;
  			BKE_paint_invalidate_overlay_tex(scene, mtex->tex);
+ 			WM_main_add_notifier(NC_BRUSH, id);
  			break;
  		}
+ 		case ID_LS:
+ 			WM_main_add_notifier(NC_LINESTYLE, id);
+ 			break;
 -		case ID_PA:
 -		{
 -			MTex *mtex = ptr->data;
 -			int recalc = OB_RECALC_DATA;
 -
 -			if (mtex->mapto & PAMAP_INIT)
 -				recalc |= PSYS_RECALC_RESET;
 -			if (mtex->mapto & PAMAP_CHILD)
 -				recalc |= PSYS_RECALC_CHILD;
 -
 -			DAG_id_tag_update(id, recalc);
 -			WM_main_add_notifier(NC_OBJECT | ND_PARTICLE | NA_EDITED, NULL);
 -			break;
 -		}
  	}
- 	rna_TextureSlot_update(bmain, scene, ptr);
  }
  
- 
  char *rna_TextureSlot_path(PointerRNA *ptr)
  {
  	MTex *mtex = ptr->data;




More information about the Bf-blender-cvs mailing list