[Bf-blender-cvs] [9465d3d] temp_remove_particles: Removed the particle context of property buttons space.

Lukas Tönne noreply at git.blender.org
Sat Apr 16 17:28:58 CEST 2016


Commit: 9465d3decf8a3aae3a6f26710b2bc09ff0253f7e
Author: Lukas Tönne
Date:   Sat Apr 16 17:17:31 2016 +0200
Branches: temp_remove_particles
https://developer.blender.org/rB9465d3decf8a3aae3a6f26710b2bc09ff0253f7e

Removed the particle context of property buttons space.

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

M	source/blender/editors/space_buttons/space_buttons.c
M	source/blender/makesdna/DNA_space_types.h

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

diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c
index 126a27c..70f29bd 100644
--- a/source/blender/editors/space_buttons/space_buttons.c
+++ b/source/blender/editors/space_buttons/space_buttons.c
@@ -157,8 +157,6 @@ static void buttons_main_region_draw(const bContext *C, ARegion *ar)
 		ED_region_panels(C, ar, "material", sbuts->mainb, vertical);
 	else if (sbuts->mainb == BCONTEXT_TEXTURE)
 		ED_region_panels(C, ar, "texture", sbuts->mainb, vertical);
-	else if (sbuts->mainb == BCONTEXT_PARTICLE)
-		ED_region_panels(C, ar, "particle", sbuts->mainb, vertical);
 	else if (sbuts->mainb == BCONTEXT_PHYSICS)
 		ED_region_panels(C, ar, "physics", sbuts->mainb, vertical);
 	else if (sbuts->mainb == BCONTEXT_BONE)
@@ -279,11 +277,6 @@ static void buttons_area_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *
 					buttons_area_redraw(sa, BCONTEXT_CONSTRAINT);
 					buttons_area_redraw(sa, BCONTEXT_BONE_CONSTRAINT);
 					break;
-				case ND_PARTICLE:
-					if (wmn->action == NA_EDITED)
-						buttons_area_redraw(sa, BCONTEXT_PARTICLE);
-					sbuts->preview = 1;
-					break;
 				case ND_DRAW:
 					buttons_area_redraw(sa, BCONTEXT_OBJECT);
 					buttons_area_redraw(sa, BCONTEXT_DATA);
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 46b7d71..2c9b3bb 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -174,7 +174,7 @@ typedef enum eSpaceButtons_Context {
 	BCONTEXT_DATA = 4,
 	BCONTEXT_MATERIAL = 5,
 	BCONTEXT_TEXTURE = 6,
-	BCONTEXT_PARTICLE = 7,
+	/*BCONTEXT_PARTICLE = 7,*/ /* DEPRECATED */
 	BCONTEXT_PHYSICS = 8,
 	BCONTEXT_BONE = 9,
 	BCONTEXT_MODIFIER = 10,




More information about the Bf-blender-cvs mailing list