Merge remote-tracking branch 'origin/master' into blender2.8
[blender.git] / source / blender / blenkernel / intern / context.c
index 4c01bfd35f21cefac047c8c5f0e50a4348610ef9..b38f59a37238ebfc6aafd608877af4a0c3a9cb7b 100644 (file)
@@ -927,7 +927,6 @@ int CTX_data_mode_enum(const bContext *C)
                        else if (ob->mode & OB_MODE_WEIGHT_PAINT) return CTX_MODE_PAINT_WEIGHT;
                        else if (ob->mode & OB_MODE_VERTEX_PAINT) return CTX_MODE_PAINT_VERTEX;
                        else if (ob->mode & OB_MODE_TEXTURE_PAINT) return CTX_MODE_PAINT_TEXTURE;
-                       else if (ob->mode & OB_MODE_PARTICLE_EDIT) return CTX_MODE_PARTICLE;
                }
        }
 
@@ -950,7 +949,6 @@ static const char *data_mode_strings[] = {
        "weightpaint",
        "vertexpaint",
        "imagepaint",
-       "particlemode",
        "objectmode",
        NULL
 };